Commit 909dfc60 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Rafael J. Wysocki
Browse files

ACPI: battery: allocate driver data through devm_ APIs 



Simplify the cleanup logic a bit.

Signed-off-by: default avatarThomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240904-acpi-battery-cleanups-v1-2-a3bf74f22d40@weissschuh.net


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent e7b7fe3f

drivers/acpi/battery.c

+1 −3
Original line number Diff line number Diff line
@@ -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;
@@ -1258,7 +1258,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;

}
@@ -1281,7 +1280,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