redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ACPI: Use struct dev_pm_ops for power management in the button driver 

Make the ACPI button 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>
hifive-unleashed-5.1
Rafael J. Wysocki 2012-06-27 23:26:51 +02:00
parent a6f50dc8ef
commit 1be532de83
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/acpi/button.c
View File

@ -76,19 +76,21 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);
static int acpi_button_add(struct acpi_device *device); static int acpi_button_add(struct acpi_device *device);
static int acpi_button_remove(struct acpi_device *device, int type); static int acpi_button_remove(struct acpi_device *device, int type);
static int acpi_button_resume(struct acpi_device *device);
static void acpi_button_notify(struct acpi_device *device, u32 event); static void acpi_button_notify(struct acpi_device *device, u32 event);
static int acpi_button_resume(struct device *dev);
static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);
static struct acpi_driver acpi_button_driver = { static struct acpi_driver acpi_button_driver = {
.name = "button", .name = "button",
.class = ACPI_BUTTON_CLASS, .class = ACPI_BUTTON_CLASS,
.ids = button_device_ids, .ids = button_device_ids,
.ops = { .ops = {
.add = acpi_button_add, .add = acpi_button_add,
.resume = acpi_button_resume,
.remove = acpi_button_remove, .remove = acpi_button_remove,
.notify = acpi_button_notify, .notify = acpi_button_notify,
}, },
.drv.pm = &acpi_button_pm,
}; };
struct acpi_button { struct acpi_button {
@ -308,8 +310,9 @@ static void acpi_button_notify(struct acpi_device *device, u32 event)
} }
} }
static int acpi_button_resume(struct acpi_device *device) static int acpi_button_resume(struct device *dev)
{ {
struct acpi_device *device = to_acpi_device(dev);
struct acpi_button *button = acpi_driver_data(device); struct acpi_button *button = acpi_driver_data(device);
if (button->type == ACPI_BUTTON_TYPE_LID) if (button->type == ACPI_BUTTON_TYPE_LID)