Skip to content

Commit

Permalink
acpi_power_meter: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jul 1, 2012
1 parent d26c844 commit c5dec01
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions drivers/hwmon/acpi_power_meter.c
Original file line number Diff line number Diff line change
Expand Up @@ -929,30 +929,35 @@ static int acpi_power_meter_remove(struct acpi_device *device, int type)
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;

if (!device || !acpi_driver_data(device))
if (!dev)
return -EINVAL;

resource = acpi_driver_data(to_acpi_device(dev));
if (!resource)
return -EINVAL;

resource = acpi_driver_data(device);
free_capabilities(resource);
read_capabilities(resource);

return 0;
}

static SIMPLE_DEV_PM_OPS(acpi_power_meter_pm, NULL, acpi_power_meter_resume);

static struct acpi_driver acpi_power_meter_driver = {
.name = "power_meter",
.class = ACPI_POWER_METER_CLASS,
.ids = power_meter_ids,
.ops = {
.add = acpi_power_meter_add,
.remove = acpi_power_meter_remove,
.resume = acpi_power_meter_resume,
.notify = acpi_power_meter_notify,
},
.drv.pm = &acpi_power_meter_pm,
};

/* Module init/exit routines */
Expand Down

0 comments on commit c5dec01

Please sign in to comment.