Skip to content

Commit

Permalink
xo15-ebook: Use struct dev_pm_ops for power management
Browse files Browse the repository at this point in the history
Make the xo15-ebook 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 d69239a commit 44cb98c
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/platform/x86/xo15-ebook.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ static void ebook_switch_notify(struct acpi_device *device, u32 event)
}
}

static int ebook_switch_resume(struct acpi_device *device)
static int ebook_switch_resume(struct device *dev)
{
return ebook_send_state(device);
return ebook_send_state(to_acpi_device(dev));
}

static SIMPLE_DEV_PM_OPS(ebook_switch_pm, NULL, ebook_switch_resume);

static int ebook_switch_add(struct acpi_device *device)
{
struct ebook_switch *button;
Expand Down Expand Up @@ -161,10 +163,10 @@ static struct acpi_driver xo15_ebook_driver = {
.ids = ebook_device_ids,
.ops = {
.add = ebook_switch_add,
.resume = ebook_switch_resume,
.remove = ebook_switch_remove,
.notify = ebook_switch_notify,
},
.drv.pm = &ebook_switch_pm,
};

static int __init xo15_ebook_init(void)
Expand Down

0 comments on commit 44cb98c

Please sign in to comment.