From: Len Brown <len.brown@intel.com>
Date: Thu, 18 Jun 2009 04:38:27 +0000 (-0400)
Subject: ACPI: battery: fix CONFIG_ACPI_PROCFS_POWER=n build warning
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=586caae36cece718ff46b3a59b88af79e9f7a2e0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

ACPI: battery: fix CONFIG_ACPI_PROCFS_POWER=n build warning

drivers/acpi/battery.c:841: warning: label ‘end’ defined but not used

Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index eb00c4e3747a..58b4517ce712 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -832,14 +832,12 @@ static int acpi_battery_add(struct acpi_device *device)
 	acpi_battery_update(battery);
 #ifdef CONFIG_ACPI_PROCFS_POWER
 	result = acpi_battery_add_fs(device);
-	if (result)
-		goto end;
 #endif
-	printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
-	       ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
-	       device->status.battery_present ? "present" : "absent");
-      end:
-	if (result) {
+	if (!result) {
+		printk(KERN_INFO PREFIX "%s Slot [%s] (battery %s)\n",
+			ACPI_BATTERY_DEVICE_NAME, acpi_device_bid(device),
+			device->status.battery_present ? "present" : "absent");
+	} else {
 #ifdef CONFIG_ACPI_PROCFS_POWER
 		acpi_battery_remove_fs(device);
 #endif