ACPI: battery: remove redundant old_present check on insertion

[sfrench/cifs-2.6.git] / drivers / acpi / battery.c

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index d79ad844c78fcee1e51cfa7cde066363e45f51ef..78e40a9f5e182326202bef49b9610f620f71fcaf 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -918,10 +918,11 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
 
 static int acpi_battery_update(struct acpi_battery *battery, bool resume)
 {
-       int result, old_present = acpi_battery_present(battery);
-       result = acpi_battery_get_status(battery);
+       int result = acpi_battery_get_status(battery);
+
        if (result)
                return result;
+
        if (!acpi_battery_present(battery)) {
                sysfs_remove_battery(battery);
                battery->update_time = 0;
@@ -931,8 +932,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume)
        if (resume)
                return 0;
 
-       if (!battery->update_time ||
-           old_present != acpi_battery_present(battery)) {
+       if (!battery->update_time) {
                result = acpi_battery_get_info(battery);
                if (result)
                        return result;