diff mbox series

[4/5] ACPI: battery: use DEFINE_SIMPLE_DEV_PM_OPS

Message ID 20240904-acpi-battery-cleanups-v1-4-a3bf74f22d40@weissschuh.net
State Accepted
Commit a56fdd874301c3a2d27097a7084467ab5bdc6815
Headers show
Series ACPI: battery: various cleanups | expand

Commit Message

Thomas Weißschuh Sept. 4, 2024, 7:12 a.m. UTC 
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: Thomas Weißschuh <linux@weissschuh.net>
---
 drivers/acpi/battery.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index da50ca8df007..4bd746f8c0ac 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -1274,7 +1274,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)
 {
@@ -1291,11 +1290,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",
@@ -1305,7 +1301,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),
 };
 
 static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)