diff options
| author | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2022-09-25 18:27:44 +0100 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2022-09-25 14:22:11 -0700 |
| commit | 00f4095c967f00c5ad450569f66f0bb82cc97178 (patch) | |
| tree | 02aaf2f9dd7016418f09e41777492fa41a84601b | |
| parent | e7045a14fa1459f4fd56c3b6944382a00586cc89 (diff) | |
| download | linux-00f4095c967f00c5ad450569f66f0bb82cc97178.tar.gz linux-00f4095c967f00c5ad450569f66f0bb82cc97178.tar.bz2 linux-00f4095c967f00c5ad450569f66f0bb82cc97178.zip | |
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: Jonathan 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.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | drivers/hwmon/acpi_power_meter.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c index d2545a1be9fc..6d02947409d5 100644 --- a/drivers/hwmon/acpi_power_meter.c +++ b/drivers/hwmon/acpi_power_meter.c @@ -927,8 +927,6 @@ static int acpi_power_meter_remove(struct acpi_device *device) return 0; } -#ifdef CONFIG_PM_SLEEP - static int acpi_power_meter_resume(struct device *dev) { struct acpi_power_meter_resource *resource; @@ -946,9 +944,8 @@ static int acpi_power_meter_resume(struct device *dev) return 0; } -#endif /* CONFIG_PM_SLEEP */ - -static SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL, acpi_power_meter_resume); +static DEFINE_SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL, + acpi_power_meter_resume); static struct acpi_driver acpi_power_meter_driver = { .name = "power_meter", @@ -959,7 +956,7 @@ static struct acpi_driver acpi_power_meter_driver = { .remove = acpi_power_meter_remove, .notify = acpi_power_meter_notify, }, - .drv.pm = &acpi_power_meter_pm, + .drv.pm = pm_sleep_ptr(&acpi_power_meter_pm), }; /* Module init/exit routines */ |