ACPI: battery: Reduce code duplication related to cleanup

rafaeljw · rafaeljw · commit 0d17aafa79c6 · 2025-12-26T15:11:38.000+01:00
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
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -1279,9 +1279,7 @@ static void acpi_battery_remove(struct acpi_device *device)`
`1279`	`1279`	`device_init_wakeup(&device->dev, 0);`
`1280`	`1280`	`unregister_pm_notifier(&battery->pm_nb);`
`1281`	`1281`
`1282`		`- guard(mutex)(&battery->update_lock);`
`1283`		`-`
`1284`		`- sysfs_remove_battery(battery);`
	`1282`	`+ sysfs_battery_cleanup(battery);`
`1285`	`1283`	`}`
`1286`	`1284`
`1287`	`1285`	`/* this is needed to learn about changes made in suspended state */`