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

ACPI: battery: use DEFINE_SIMPLE_DEV_PM_OPS 



Use the recommended macro to define the PM ops.

Also use pm_sleep_ptr() when assigning the ops to the driver.
This allows the removal of the ifdef CONFIG_PM_SLEEP.

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


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

drivers/acpi/battery.c

+2 −6
Original line number Diff line number Diff line
@@ -1277,7 +1277,6 @@ static void acpi_battery_remove(struct acpi_device *device) 
	sysfs_remove_battery(battery);

}



#ifdef CONFIG_PM_SLEEP

/* this is needed to learn about changes made in suspended state */

static int acpi_battery_resume(struct device *dev)

{
@@ -1294,11 +1293,8 @@ static int acpi_battery_resume(struct device *dev) 
	acpi_battery_update(battery, true);

	return 0;

}

#else

#define acpi_battery_resume NULL

#endif



static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

static DEFINE_SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);



static struct acpi_driver acpi_battery_driver = {

	.name = "battery",
@@ -1308,7 +1304,7 @@ static struct acpi_driver acpi_battery_driver = { 
		.add = acpi_battery_add,

		.remove = acpi_battery_remove,

		},

	.drv.pm = &acpi_battery_pm,

	.drv.pm = pm_sleep_ptr(&acpi_battery_pm),

	.drv.probe_type = PROBE_PREFER_ASYNCHRONOUS,

};