ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
PATCH 1/2 ACPI: battery: Fix CONFIG_ACPI_SYSFS_POWER=n
Disabling CONFIG_ACPI_SYSFS_POWER changes the behaviour of acpi_battery_update(). It will call acpi_battery_get_info() even if the battery is not present. I haven't noticed this causing any problem, but it does look like a bad idea.
Signed-off-by Alan Jenkins <[email protected]>
CC Alexey Starikovskiy <[email protected]>
---drivers/acpi/battery.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/battery.c +0 -0
@@ -522,13 +522,13 @@ static int acpi_battery_update(struct acpi_battery *battery)
result = acpi_battery_get_status(battery);
if (result)
return result;
-#ifdef CONFIG_ACPI_SYSFS_POWER
if (!acpi_battery_present(battery)) {
+#ifdef CONFIG_ACPI_SYSFS_POWER
sysfs_remove_battery(battery);
+#endif
battery->update_time = 0;
return 0;
}
-#endif
if (!battery->update_time ||
old_present != acpi_battery_present(battery)) {
result = acpi_battery_get_info(battery);Signature · 1 line
1.6.3.3
PATCH 2/2 ACPI: battery drivers should call power_supply_changed()
Calling kobject_uevent() directly is a layering violation. In particular, it means we'll miss updating the generic LED trigger.
Signed-off-by Alan Jenkins <[email protected]>
CC Alexey Starikovskiy <[email protected]>
---drivers/acpi/battery.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
drivers/acpi/battery.c +0 -0
@@ -833,7 +833,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event)
#ifdef CONFIG_ACPI_SYSFS_POWER /* acpi_batter_update could remove power_supply object */ if (battery->bat.dev)
- kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);
+ power_supply_changed(&battery->bat);
#endif
}
Signature · 1 line
1.6.3.3