diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-27 17:27:55 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-01 07:31:05 -0400 |
commit | 44cb98c48e19f506e178c519f5da2c23a156e002 (patch) | |
tree | c705a632acdc63485ac55e6a741a48c49465891f /drivers/platform/x86/xo15-ebook.c | |
parent | d69239ae5847b29ea1902b2dd86f5afa41144ba3 (diff) |
xo15-ebook: Use struct dev_pm_ops for power management
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>
Diffstat (limited to 'drivers/platform/x86/xo15-ebook.c')
-rw-r--r-- | drivers/platform/x86/xo15-ebook.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/x86/xo15-ebook.c b/drivers/platform/x86/xo15-ebook.c index fad153dc0355..849c07c13bf6 100644 --- a/drivers/platform/x86/xo15-ebook.c +++ b/drivers/platform/x86/xo15-ebook.c | |||
@@ -77,11 +77,13 @@ static void ebook_switch_notify(struct acpi_device *device, u32 event) | |||
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | static int ebook_switch_resume(struct acpi_device *device) | 80 | static int ebook_switch_resume(struct device *dev) |
81 | { | 81 | { |
82 | return ebook_send_state(device); | 82 | return ebook_send_state(to_acpi_device(dev)); |
83 | } | 83 | } |
84 | 84 | ||
85 | static SIMPLE_DEV_PM_OPS(ebook_switch_pm, NULL, ebook_switch_resume); | ||
86 | |||
85 | static int ebook_switch_add(struct acpi_device *device) | 87 | static int ebook_switch_add(struct acpi_device *device) |
86 | { | 88 | { |
87 | struct ebook_switch *button; | 89 | struct ebook_switch *button; |
@@ -161,10 +163,10 @@ static struct acpi_driver xo15_ebook_driver = { | |||
161 | .ids = ebook_device_ids, | 163 | .ids = ebook_device_ids, |
162 | .ops = { | 164 | .ops = { |
163 | .add = ebook_switch_add, | 165 | .add = ebook_switch_add, |
164 | .resume = ebook_switch_resume, | ||
165 | .remove = ebook_switch_remove, | 166 | .remove = ebook_switch_remove, |
166 | .notify = ebook_switch_notify, | 167 | .notify = ebook_switch_notify, |
167 | }, | 168 | }, |
169 | .drv.pm = &ebook_switch_pm, | ||
168 | }; | 170 | }; |
169 | 171 | ||
170 | static int __init xo15_ebook_init(void) | 172 | static int __init xo15_ebook_init(void) |