ACPI: battery: Reduce code duplication related to cleanup

Notice that sysfs_battery_cleanup() calls sysfs_remove_battery() under
battery->update_lock which is also done in acpi_battery_remove(), so
adjust the latter to use it.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1866517.TLkxdtWsSY@rafael.j.wysocki

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 582c35fc8d03f1cc87d221ec60b63319edfb09a0..4a66c62911028a599d49c981710bcce8bbb15171 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1279,9 +1279,7 @@ static void acpi_battery_remove(struct acpi_device *device)
        device_init_wakeup(&device->dev, 0);
        unregister_pm_notifier(&battery->pm_nb);
 
-       guard(mutex)(&battery->update_lock);
-
-       sysfs_remove_battery(battery);
+       sysfs_battery_cleanup(battery);
 }
 
 /* this is needed to learn about changes made in suspended state */