Commit 6993ce46 authored Dec 05, 2017 by Bjørn Mork Committed by Rafael J. Wysocki Dec 13, 2017

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>

parent 50c4c4e2

drivers/acpi/battery.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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),