Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jonathan Cameron 2022-09-25 18:27:44 +01:00 committed by Guenter Roeck
parent e7045a14fa
commit 00f4095c96
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwmon/acpi_power_meter.c
View File

@ -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)
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 = {
.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 */