lkml.org 
[lkml]   [2017]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 07/10] platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling
Date
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

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>
---
drivers/platform/x86/fujitsu-laptop.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index ba0c0c211251..a5478a011b90 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -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) {
--
2.11.1
\
 
 \ /
  Last update: 2017-02-08 15:38    [W:0.151 / U:0.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site