platform/x86: fujitsu-laptop: do not log LED registration failures
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ń <kernel@kempniu.pl> Reviewed-by: Jonathan Woithe <jwoithe@just42.net> Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org>
This commit is contained in:
Родитель
81f6821f3f
Коммит
30943e1484
|
@ -724,22 +724,20 @@ static struct led_classdev eco_led = {
|
||||||
|
|
||||||
static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device)
|
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) {
|
if (call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & LOGOLAMP_POWERON) {
|
||||||
result = devm_led_classdev_register(&device->dev,
|
result = devm_led_classdev_register(&device->dev,
|
||||||
&logolamp_led);
|
&logolamp_led);
|
||||||
if (result)
|
if (result)
|
||||||
pr_err("Could not register LED handler for logo lamp, error %i\n",
|
return result;
|
||||||
result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) &&
|
if ((call_fext_func(FUNC_LEDS, 0x0, 0x0, 0x0) & KEYBOARD_LAMPS) &&
|
||||||
(call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) {
|
(call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) == 0x0)) {
|
||||||
result = devm_led_classdev_register(&device->dev, &kblamps_led);
|
result = devm_led_classdev_register(&device->dev, &kblamps_led);
|
||||||
if (result)
|
if (result)
|
||||||
pr_err("Could not register LED handler for keyboard lamps, error %i\n",
|
return result;
|
||||||
result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -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)) {
|
if (call_fext_func(FUNC_BUTTONS, 0x0, 0x0, 0x0) & BIT(24)) {
|
||||||
result = devm_led_classdev_register(&device->dev, &radio_led);
|
result = devm_led_classdev_register(&device->dev, &radio_led);
|
||||||
if (result)
|
if (result)
|
||||||
pr_err("Could not register LED handler for radio LED, error %i\n",
|
return result;
|
||||||
result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Support for eco led is not always signaled in bit corresponding
|
/* Support for eco led is not always signaled in bit corresponding
|
||||||
|
@ -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)) {
|
(call_fext_func(FUNC_LEDS, 0x2, ECO_LED, 0x0) != UNSUPPORTED_CMD)) {
|
||||||
result = devm_led_classdev_register(&device->dev, &eco_led);
|
result = devm_led_classdev_register(&device->dev, &eco_led);
|
||||||
if (result)
|
if (result)
|
||||||
pr_err("Could not register LED handler for eco LED, error %i\n",
|
return result;
|
||||||
result);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int acpi_fujitsu_laptop_add(struct acpi_device *device)
|
static int acpi_fujitsu_laptop_add(struct acpi_device *device)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче