FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-15 06:00:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling

Browse Source 
A separate variable is not needed to handle error codes returned by
acpi_bus_register_driver().  If the latter fails, just use the value it
returned as the value returned by fujitsu_init().

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
[kempniu: rebase patch, rewrite commit message]
Signed-off-by: Michał Kępień <kernel@kempniu.pl>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Jonathan Woithe <jwoithe@just42.net>
This commit is contained in:
Alan Jenkins 2017-02-08 14:46:30 +01:00 committed by Andy Shevchenko
parent 8c590e339f
commit c1d1e8a051
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/platform/x86/fujitsu-laptop.c
View File

@ -1192,7 +1192,7 @@ MODULE_DEVICE_TABLE(acpi, fujitsu_ids);
static int __init fujitsu_init(void)
{
int ret, result, max_brightness;
int ret, max_brightness;
if (acpi_disabled)
return -ENODEV;
@ -1207,11 +1207,9 @@ static int __init fujitsu_init(void)
fujitsu_bl->keycode5 = KEY_RFKILL;
dmi_check_system(fujitsu_dmi_table);
result = acpi_bus_register_driver(&acpi_fujitsu_bl_driver);
if (result < 0) {
ret = -ENODEV;
ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver);
if (ret)
goto fail_acpi;
}
/* Register platform stuff */
@ -1264,11 +1262,9 @@ static int __init fujitsu_init(void)
goto fail_laptop;
}
result = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver);
if (result < 0) {
ret = -ENODEV;
ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver);
if (ret)
goto fail_laptop1;
}
/* Sync backlight power status (needs FUJ02E3 device, hence deferred) */
if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {