diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 13:06:19 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 13:06:19 -0400 |
commit | 9033132ddff7d096f3e54704c4250384c5ab3aa2 (patch) | |
tree | 41b944e5f7a52f66ae9ebc47dd169340b890fe2d /drivers/platform | |
parent | e25d5c11eeeec610af2e0ff51e60d7cdadefe0f2 (diff) |
msi-laptop: Use struct dev_pm_ops for power management
Make the msi-laptop driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct platform_driver.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Lee, Chun-Yi <jlee@suse.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/msi-laptop.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index bb5132128b33..f64441844317 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c | |||
@@ -85,7 +85,8 @@ | |||
85 | #define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4 | 85 | #define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4 |
86 | #define MSI_STANDARD_EC_TOUCHPAD_MASK (1 << 4) | 86 | #define MSI_STANDARD_EC_TOUCHPAD_MASK (1 << 4) |
87 | 87 | ||
88 | static int msi_laptop_resume(struct platform_device *device); | 88 | static int msi_laptop_resume(struct device *device); |
89 | static SIMPLE_DEV_PM_OPS(msi_laptop_pm, NULL, msi_laptop_resume); | ||
89 | 90 | ||
90 | #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS 0x2f | 91 | #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS 0x2f |
91 | 92 | ||
@@ -437,8 +438,8 @@ static struct platform_driver msipf_driver = { | |||
437 | .driver = { | 438 | .driver = { |
438 | .name = "msi-laptop-pf", | 439 | .name = "msi-laptop-pf", |
439 | .owner = THIS_MODULE, | 440 | .owner = THIS_MODULE, |
441 | .pm = &msi_laptop_pm, | ||
440 | }, | 442 | }, |
441 | .resume = msi_laptop_resume, | ||
442 | }; | 443 | }; |
443 | 444 | ||
444 | static struct platform_device *msipf_device; | 445 | static struct platform_device *msipf_device; |
@@ -752,7 +753,7 @@ err_bluetooth: | |||
752 | return retval; | 753 | return retval; |
753 | } | 754 | } |
754 | 755 | ||
755 | static int msi_laptop_resume(struct platform_device *device) | 756 | static int msi_laptop_resume(struct device *device) |
756 | { | 757 | { |
757 | u8 data; | 758 | u8 data; |
758 | int result; | 759 | int result; |