diff options
author | Luis Henriques <luis.henriques@canonical.com> | 2015-05-11 17:48:46 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-05-13 18:58:40 -0400 |
commit | 479faaf00fde35e80a5be1389938b38e422d799d (patch) | |
tree | 2e9ab42aa9c5e41c44a4e6a13e4e84d33aa33a91 | |
parent | e234b074c8ebe736f74cc40a8953accb66b82d04 (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.c | 10 |
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 = { | |||
1292 | 1292 | ||
1293 | static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) | 1293 | static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) |
1294 | { | 1294 | { |
1295 | int result; | ||
1296 | |||
1295 | dmi_check_system(bat_dmi_table); | 1297 | dmi_check_system(bat_dmi_table); |
1296 | 1298 | ||
1297 | #ifdef CONFIG_ACPI_PROCFS_POWER | 1299 | #ifdef CONFIG_ACPI_PROCFS_POWER |
1298 | acpi_battery_dir = acpi_lock_battery_dir(); | 1300 | acpi_battery_dir = acpi_lock_battery_dir(); |
1299 | if (!acpi_battery_dir) | 1301 | if (!acpi_battery_dir) |
1300 | return; | 1302 | return; |
1301 | #endif | 1303 | #endif |
1302 | if (acpi_bus_register_driver(&acpi_battery_driver) < 0) { | 1304 | result = acpi_bus_register_driver(&acpi_battery_driver); |
1303 | #ifdef CONFIG_ACPI_PROCFS_POWER | 1305 | #ifdef CONFIG_ACPI_PROCFS_POWER |
1306 | if (result < 0) | ||
1304 | acpi_unlock_battery_dir(acpi_battery_dir); | 1307 | acpi_unlock_battery_dir(acpi_battery_dir); |
1305 | #endif | 1308 | #endif |
1306 | return; | ||
1307 | } | ||
1308 | return; | ||
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | static int __init acpi_battery_init(void) | 1311 | static int __init acpi_battery_init(void) |