ACPI: battery: allocate driver data through devm_ APIs

[ Upstream commit 909dfc60692331e1599d5e28a8f08a611f353aef ]

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-2-a3bf74f22d40@weissschuh.net
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 399dbcadc01e ("ACPI: battery: Add synchronization between interface updates")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 65fa3444367a13ac83644444076a11f08152c382..c6e29e377b9ca3d54a6b0e949ed67fe373fd4362 100644 (file)
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1218,7 +1218,7 @@ static int acpi_battery_add(struct acpi_device *device)
        if (device->dep_unmet)
                return -EPROBE_DEFER;
 
-       battery = kzalloc(sizeof(struct acpi_battery), GFP_KERNEL);
+       battery = devm_kzalloc(&device->dev, sizeof(*battery), GFP_KERNEL);
        if (!battery)
                return -ENOMEM;
        battery->device = device;
@@ -1256,7 +1256,6 @@ fail:
        sysfs_remove_battery(battery);
        mutex_destroy(&battery->lock);
        mutex_destroy(&battery->sysfs_lock);
-       kfree(battery);
 
        return result;
 }
@@ -1279,7 +1278,6 @@ static void acpi_battery_remove(struct acpi_device *device)
 
        mutex_destroy(&battery->lock);
        mutex_destroy(&battery->sysfs_lock);
-       kfree(battery);
 }
 
 #ifdef CONFIG_PM_SLEEP