diff options
| author | Bjørn Mork <bjorn@mork.no> | 2017-12-05 18:46:39 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-12-13 01:14:54 +0100 |
| commit | 6993ce46c910ec83b4a7f064bbf76f254217019c (patch) | |
| tree | 43c5ab5213939d241ef95a478d03e9731a3ced13 /drivers/acpi/battery.c | |
| parent | Linux 4.15-rc3 (diff) | |
| download | linux-6993ce46c910ec83b4a7f064bbf76f254217019c.tar.xz linux-6993ce46c910ec83b4a7f064bbf76f254217019c.zip | |
ACPI: battery: Drop redundant test for failure
Merging the two adjacent conditionally built blocks makes the code
a lot more readable. And as a bonus, we drop a duplicate test when
CONFIG_ACPI_PROCFS_POWER is undefined.
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/battery.c')
| -rw-r--r-- | drivers/acpi/battery.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 13e7b56e33ae..f2eb6c37ea0a 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -1237,13 +1237,11 @@ static int acpi_battery_add(struct acpi_device *device) #ifdef CONFIG_ACPI_PROCFS_POWER result = acpi_battery_add_fs(device); -#endif if (result) { -#ifdef CONFIG_ACPI_PROCFS_POWER acpi_battery_remove_fs(device); -#endif goto fail; } +#endif printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n", ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device), |