From: "Michał Kępień" <kernel@kempniu.pl>
To: Jonathan Woithe <jwoithe@just42.net>, Darren Hart <dvhart@infradead.org>
Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling
Date: Fri, 13 Jan 2017 12:02:37 +0100 [thread overview]
Message-ID: <20170113110240.622-2-kernel@kempniu.pl> (raw)
In-Reply-To: <20170113110240.622-1-kernel@kempniu.pl>
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: 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 b725a907a91f..9f62d9e1b0de 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1176,7 +1176,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;
@@ -1191,11 +1191,9 @@ static int __init fujitsu_init(void)
fujitsu->keycode5 = KEY_RFKILL;
dmi_check_system(fujitsu_dmi_table);
- result = acpi_bus_register_driver(&acpi_fujitsu_driver);
- if (result < 0) {
- ret = -ENODEV;
+ ret = acpi_bus_register_driver(&acpi_fujitsu_driver);
+ if (ret)
goto fail_acpi;
- }
/* Register platform stuff */
@@ -1248,11 +1246,9 @@ static int __init fujitsu_init(void)
goto fail_hotkey;
}
- result = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver);
- if (result < 0) {
- ret = -ENODEV;
+ ret = acpi_bus_register_driver(&acpi_fujitsu_hotkey_driver);
+ if (ret)
goto fail_hotkey1;
- }
/* Sync backlight power status (needs FUJ02E3 device, hence deferred) */
if (acpi_video_get_backlight_type() == acpi_backlight_vendor) {
--
2.11.0
next prev parent reply other threads:[~2017-01-13 11:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-13 11:02 [PATCH 0/4] fujitsu_init() cleanup Michał Kępień
2017-01-13 11:02 ` Michał Kępień [this message]
2017-01-13 11:02 ` [PATCH 2/4] platform/x86: fujitsu-laptop: register backlight device in a separate function Michał Kępień
2017-01-13 11:02 ` [PATCH 3/4] platform/x86: fujitsu-laptop: sync backlight power status in acpi_fujitsu_hotkey_add() Michał Kępień
2017-01-13 11:02 ` [PATCH 4/4] platform/x86: fujitsu-laptop: cleanup error labels in fujitsu_init() Michał Kępień
2017-01-13 12:17 ` [PATCH 0/4] fujitsu_init() cleanup Jonathan Woithe
2017-01-13 13:19 ` Michał Kępień
2017-01-24 11:53 ` Jonathan Woithe
2017-02-03 14:06 ` Michał Kępień
2017-02-03 14:13 ` Andy Shevchenko
2017-02-04 0:44 ` Darren Hart
2017-02-04 6:21 ` Michał Kępień
2017-02-04 14:11 ` Andy Shevchenko
2017-02-27 7:19 ` Michał Kępień
2017-02-28 6:17 ` Darren Hart
2017-02-28 8:07 ` Greg Kroah-Hartman
2017-02-28 8:33 ` Michał Kępień
2017-02-28 11:24 ` Jonathan Woithe
2017-02-28 13:24 ` Michał Kępień
2017-02-28 14:01 ` Greg Kroah-Hartman
2017-02-28 14:40 ` Andy Shevchenko
2017-03-01 3:19 ` Darren Hart
2017-02-28 11:14 ` Jonathan Woithe
2017-02-28 12:33 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170113110240.622-2-kernel@kempniu.pl \
--to=kernel@kempniu.pl \
--cc=dvhart@infradead.org \
--cc=jwoithe@just42.net \
--cc=linux-kernel@vger.kernel.org \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox