瀏覽代碼

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

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>
Alan Jenkins 8 年之前
父節點
當前提交
c1d1e8a051
共有 1 個文件被更改,包括 5 次插入9 次删除
  1. 5 9
      drivers/platform/x86/fujitsu-laptop.c

+ 5 - 9
drivers/platform/x86/fujitsu-laptop.c

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