Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 17:28:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi_power_meter: Use struct dev_pm_ops for power management

Browse Source 
Make the ACPI power meter driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2012-06-29 23:40:05 +02:00
parent d26c844bc1
commit c5dec01822
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/hwmon/acpi_power_meter.c
View File

@ -929,20 +929,25 @@ static int acpi_power_meter_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
static int acpi_power_meter_resume(struct acpi_device *device) static int acpi_power_meter_resume(struct device *dev)
{ {
struct acpi_power_meter_resource *resource; struct acpi_power_meter_resource *resource;
if (!device || !acpi_driver_data(device)) if (!dev)
return -EINVAL;
resource = acpi_driver_data(to_acpi_device(dev));
if (!resource)
return -EINVAL; return -EINVAL;
resource = acpi_driver_data(device);
free_capabilities(resource); free_capabilities(resource);
read_capabilities(resource); read_capabilities(resource);
return 0; return 0;
} }
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",
.class = ACPI_POWER_METER_CLASS, .class = ACPI_POWER_METER_CLASS,
@ -950,9 +955,9 @@ static struct acpi_driver acpi_power_meter_driver = {
.ops = { .ops = {
.add = acpi_power_meter_add, .add = acpi_power_meter_add,
.remove = acpi_power_meter_remove, .remove = acpi_power_meter_remove,
.resume = acpi_power_meter_resume,
.notify = acpi_power_meter_notify, .notify = acpi_power_meter_notify,
}, },
.drv.pm = &acpi_power_meter_pm,
}; };
/* Module init/exit routines */ /* Module init/exit routines */