From 0d17aafa79c6c5693a740a5b6c2693203e4043ee Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Mon, 15 Dec 2025 15:02:37 +0100 Subject: [PATCH] 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 Link: https://patch.msgid.link/1866517.TLkxdtWsSY@rafael.j.wysocki --- drivers/acpi/battery.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 582c35fc8d03f..4a66c62911028 100644 --- 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 */ -- 2.47.3