summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Henriques <luis.henriques@canonical.com>2015-05-11 22:48:46 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-05-14 00:58:40 +0200
commit479faaf00fde35e80a5be1389938b38e422d799d (patch)
tree2e9ab42aa9c5e41c44a4e6a13e4e84d33aa33a91
parente234b074c8ebe736f74cc40a8953accb66b82d04 (diff)
ACPI / battery: drop useless return statements
Signed-off-by: Luis Henriques <luis.henriques@canonical.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/battery.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 69b8e607ec35..9c676a6f32ce 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1292,20 +1292,20 @@ static struct acpi_driver acpi_battery_driver = {
static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
{
+ int result;
+
dmi_check_system(bat_dmi_table);
-
+
#ifdef CONFIG_ACPI_PROCFS_POWER
acpi_battery_dir = acpi_lock_battery_dir();
if (!acpi_battery_dir)
return;
#endif
- if (acpi_bus_register_driver(&acpi_battery_driver) < 0) {
+ result = acpi_bus_register_driver(&acpi_battery_driver);
#ifdef CONFIG_ACPI_PROCFS_POWER
+ if (result < 0)
acpi_unlock_battery_dir(acpi_battery_dir);
#endif
- return;
- }
- return;
}
static int __init acpi_battery_init(void)