Skip to content

Commit

Permalink
platform/x86: fujitsu-laptop: do not log LED registration failures
Browse files Browse the repository at this point in the history
If acpi_fujitsu_laptop_leds_register() returns an error, the latter will
become the return value of acpi_fujitsu_laptop_add(), which in turn will
be reported by driver core.  Simplify code by replacing pr_err() calls
with return statements.  Return 0 instead of result when no errors occur
in order to make the code easier to read.

Signed-off-by: Michał Kępień <[email protected]>
Reviewed-by: Jonathan Woithe <[email protected]>
Signed-off-by: Darren Hart (VMware) <[email protected]>
  • Loading branch information
kempniu authored and dvhart committed Apr 19, 2017
1 parent 81f6821 commit 30943e1
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/platform/x86/fujitsu-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -724,22 +724,20 @@ static struct led_classdev eco_led = {

static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
{
int result = 0;
int result;

if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
result = devm_led_classdev_register(&device->dev,
&logolamp_led);
if (result)
pr_err("Could not register LED handler for logo lamp, error %i\n",
result);
return result;
}

if ((call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) &&
(call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) {
result = devm_led_classdev_register(&device->dev, &kblamps_led);
if (result)
pr_err("Could not register LED handler for keyboard lamps, error %i\n",
result);
return result;
}

/*
Expand All @@ -751,8 +749,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
if (call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) & BIT(24)) {
result = devm_led_classdev_register(&device->dev, &radio_led);
if (result)
pr_err("Could not register LED handler for radio LED, error %i\n",
result);
return result;
}

/* Support for eco led is not always signaled in bit corresponding
Expand All @@ -764,11 +761,10 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
(call_fext_func(FUNC_LEDS, 0x2, ECO_LED, 0x0) != UNSUPPORTED_CMD)) {
result = devm_led_classdev_register(&device->dev, &eco_led);
if (result)
pr_err("Could not register LED handler for eco LED, error %i\n",
result);
return result;
}

return result;
return 0;
}

static int acpi_fujitsu_laptop_add(struct acpi_device *device)
Expand Down

0 comments on commit 30943e1

Please sign in to comment.