[PATCH 2/5] ACPI: battery: allocate driver data through devm_ APIs

From: Thomas Weißschuh
Date: Wed Sep 04 2024 - 03:14:32 EST


Simplify the cleanup logic a bit.

Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
---
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 677618eb38bf..a778bf6a6c4e 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1215,7 +1215,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;
@@ -1255,7 +1255,6 @@ static int acpi_battery_add(struct acpi_device *device)
sysfs_remove_battery(battery);
mutex_destroy(&battery->lock);
mutex_destroy(&battery->sysfs_lock);
- kfree(battery);

return result;
}
@@ -1278,7 +1277,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

--
2.46.0