diff options
| author |   Thomas Weißschuh <linux@weissschuh.net> | 2024-09-04 09:12:55 +0200 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2024-10-07 18:45:18 +0200 |
| commit | a56fdd874301c3a2d27097a7084467ab5bdc6815 (patch) | |
| tree | 396c20f284492f6faf5b569aaa5a3e839513ef82 | |
| parent | ACPI: battery: initialize mutexes through devm_ APIs (diff) | |
| download | wireguard-linux-a56fdd874301c3a2d27097a7084467ab5bdc6815.tar.xz wireguard-linux-a56fdd874301c3a2d27097a7084467ab5bdc6815.zip | |
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: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240904-acpi-battery-cleanups-v1-4-a3bf74f22d40@weissschuh.net
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/acpi/battery.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 940276d90dfc..d4dc4d19a2fd 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -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, }; |