ACPI: battery: initialize mutexes through devm_ APIs

Simplify the cleanup logic a bit.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240904-acpi-battery-cleanups-v1-3-a3bf74f22d40@weissschuh.net
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 151726a89a891d9675ed57a6882c02960bde838a..940276d90dfc766dfcf3066b3aedca8781c394be 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1225,8 +1225,8 @@ static int acpi_battery_add(struct acpi_device *device)
        strscpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
        strscpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
        device->driver_data = battery;
-       mutex_init(&battery->lock);
-       mutex_init(&battery->sysfs_lock);
+       devm_mutex_init(&device->dev, &battery->lock);
+       devm_mutex_init(&device->dev, &battery->sysfs_lock);
        if (acpi_has_method(battery->device->handle, "_BIX"))
                set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);
 
@@ -1256,8 +1256,6 @@ fail_pm:
        unregister_pm_notifier(&battery->pm_nb);
 fail:
        sysfs_remove_battery(battery);
-       mutex_destroy(&battery->lock);
-       mutex_destroy(&battery->sysfs_lock);
 
        return result;
 }
@@ -1277,9 +1275,6 @@ static void acpi_battery_remove(struct acpi_device *device)
        device_init_wakeup(&device->dev, 0);
        unregister_pm_notifier(&battery->pm_nb);
        sysfs_remove_battery(battery);
-
-       mutex_destroy(&battery->lock);
-       mutex_destroy(&battery->sysfs_lock);
 }
 
 #ifdef CONFIG_PM_SLEEP