Commit 00f4095c authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Guenter Roeck

hwmon: (acpi_power_meter) Switch to DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr()

These newer PM macros allow the compiler to see what code it can remove
if !CONFIG_PM_SLEEP. This allows the removal of messy #ifdef barriers whilst
achieving the same result.
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/20220925172759.3573439-4-jic23@kernel.orgSigned-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent e7045a14
...@@ -927,8 +927,6 @@ static int acpi_power_meter_remove(struct acpi_device *device) ...@@ -927,8 +927,6 @@ static int acpi_power_meter_remove(struct acpi_device *device)
return 0; return 0;
} }
#ifdef CONFIG_PM_SLEEP
static int acpi_power_meter_resume(struct device *dev) static int acpi_power_meter_resume(struct device *dev)
{ {
struct acpi_power_meter_resource *resource; struct acpi_power_meter_resource *resource;
...@@ -946,9 +944,8 @@ static int acpi_power_meter_resume(struct device *dev) ...@@ -946,9 +944,8 @@ static int acpi_power_meter_resume(struct device *dev)
return 0; return 0;
} }
#endif /* CONFIG_PM_SLEEP */ static DEFINE_SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL,
acpi_power_meter_resume);
static SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL, acpi_power_meter_resume);
static struct acpi_driver acpi_power_meter_driver = { static struct acpi_driver acpi_power_meter_driver = {
.name = "power_meter", .name = "power_meter",
...@@ -959,7 +956,7 @@ static struct acpi_driver acpi_power_meter_driver = { ...@@ -959,7 +956,7 @@ static struct acpi_driver acpi_power_meter_driver = {
.remove = acpi_power_meter_remove, .remove = acpi_power_meter_remove,
.notify = acpi_power_meter_notify, .notify = acpi_power_meter_notify,
}, },
.drv.pm = &acpi_power_meter_pm, .drv.pm = pm_sleep_ptr(&acpi_power_meter_pm),
}; };
/* Module init/exit routines */ /* Module init/exit routines */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment