Commit 0d17aafa authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/1866517.TLkxdtWsSY@rafael.j.wysocki
parent 08b54fd5
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -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 */