diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-06-29 17:39:57 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-01 07:31:05 -0400 |
commit | d26c844bc1c5e9745deffccae8d205e9b77a0fb1 (patch) | |
tree | 3d47da9bf94d1737ecab2fc1afb4bb7de24097a4 /drivers/platform | |
parent | 81bc495401955bf7a62d04f8c794718476a2b093 (diff) |
fujitsu-tablet: Use struct dev_pm_ops for power management
Make the fujitsu-tablet 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')
-rw-r--r-- | drivers/platform/x86/fujitsu-tablet.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/platform/x86/fujitsu-tablet.c b/drivers/platform/x86/fujitsu-tablet.c index da267eae8ba8..d2e41735a47b 100644 --- a/drivers/platform/x86/fujitsu-tablet.c +++ b/drivers/platform/x86/fujitsu-tablet.c | |||
@@ -440,12 +440,14 @@ static int __devexit acpi_fujitsu_remove(struct acpi_device *adev, int type) | |||
440 | return 0; | 440 | return 0; |
441 | } | 441 | } |
442 | 442 | ||
443 | static int acpi_fujitsu_resume(struct acpi_device *adev) | 443 | static int acpi_fujitsu_resume(struct device *dev) |
444 | { | 444 | { |
445 | fujitsu_reset(); | 445 | fujitsu_reset(); |
446 | return 0; | 446 | return 0; |
447 | } | 447 | } |
448 | 448 | ||
449 | static SIMPLE_DEV_PM_OPS(acpi_fujitsu_pm, NULL, acpi_fujitsu_resume); | ||
450 | |||
449 | static struct acpi_driver acpi_fujitsu_driver = { | 451 | static struct acpi_driver acpi_fujitsu_driver = { |
450 | .name = MODULENAME, | 452 | .name = MODULENAME, |
451 | .class = "hotkey", | 453 | .class = "hotkey", |
@@ -453,8 +455,8 @@ static struct acpi_driver acpi_fujitsu_driver = { | |||
453 | .ops = { | 455 | .ops = { |
454 | .add = acpi_fujitsu_add, | 456 | .add = acpi_fujitsu_add, |
455 | .remove = acpi_fujitsu_remove, | 457 | .remove = acpi_fujitsu_remove, |
456 | .resume = acpi_fujitsu_resume, | 458 | }, |
457 | } | 459 | .drv.pm = &acpi_fujitsu_pm, |
458 | }; | 460 | }; |
459 | 461 | ||
460 | static int __init fujitsu_module_init(void) | 462 | static int __init fujitsu_module_init(void) |