Keeping this device around lets userspace know that we have a battery
bay, even if there is nothing in it at the moment. This is what every
other battery driver does, so ACPI should do it as well.
There is no reason to preserve the old behaviour. We now correctly
provide the "present" attribute, which will return "0" when the battery
is removed. HAL was already trying to check this attribute, so
it should be fine.
Signed-off-by: Alan Jenkins <alan-jenkins@xxxxxxxxxxxxxx>
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 9208e97..9331f01 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -487,8 +487,6 @@ static int sysfs_add_battery(struct acpi_battery *battery)
static void sysfs_remove_battery(struct acpi_battery *battery)
{
- if (!battery->bat.dev)
- return;
device_remove_file(battery->bat.dev, &alarm_attr);
power_supply_unregister(&battery->bat);
battery->bat.dev = NULL;
@@ -502,9 +500,6 @@ static int acpi_battery_update(struct acpi_battery *battery)
if (result)
return result;
if (!acpi_battery_present(battery)) {
-#ifdef CONFIG_ACPI_SYSFS_POWER
- sysfs_remove_battery(battery);
-#endif
battery->update_time = 0;
return 0;
}
@@ -515,10 +510,6 @@ static int acpi_battery_update(struct acpi_battery *battery)
return result;
acpi_battery_init_alarm(battery);
}
-#ifdef CONFIG_ACPI_SYSFS_POWER
- if (!battery->bat.dev)
- sysfs_add_battery(battery);
-#endif
return acpi_battery_get_state(battery);
}
@@ -810,9 +801,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
dev_name(&device->dev), event,
acpi_battery_present(battery));
#ifdef CONFIG_ACPI_SYSFS_POWER
- /* acpi_batter_update could remove power_supply object */
- if (battery->bat.dev)
- power_supply_changed(&battery->bat);
+ power_supply_changed(&battery->bat);
#endif
}
@@ -837,6 +826,11 @@ static int acpi_battery_add(struct acpi_device *device)
if (result)
goto end;
#endif
+#ifdef CONFIG_ACPI_SYSFS_POWER
+ result = sysfs_add_battery(battery);
+ if (result)
+ goto end;
+#endif
status = acpi_install_notify_handler(device->handle,
ACPI_ALL_NOTIFY,
acpi_battery_notify, battery);
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
