diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 19:06:19 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-06 19:06:19 +0200 |
| commit | 9033132ddff7d096f3e54704c4250384c5ab3aa2 (patch) | |
| tree | 41b944e5f7a52f66ae9ebc47dd169340b890fe2d | |
| parent | e25d5c11eeeec610af2e0ff51e60d7cdadefe0f2 (diff) | |
| download | op-kernel-dev-9033132ddff7d096f3e54704c4250384c5ab3aa2.zip op-kernel-dev-9033132ddff7d096f3e54704c4250384c5ab3aa2.tar.gz | |
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>
| -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 bb51321..f644418 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -85,7 +85,8 @@ #define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4 #define MSI_STANDARD_EC_TOUCHPAD_MASK (1 << 4) -static int msi_laptop_resume(struct platform_device *device); +static int msi_laptop_resume(struct device *device); +static SIMPLE_DEV_PM_OPS(msi_laptop_pm, NULL, msi_laptop_resume); #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS 0x2f @@ -437,8 +438,8 @@ static struct platform_driver msipf_driver = { .driver = { .name = "msi-laptop-pf", .owner = THIS_MODULE, + .pm = &msi_laptop_pm, }, - .resume = msi_laptop_resume, }; static struct platform_device *msipf_device; @@ -752,7 +753,7 @@ err_bluetooth: return retval; } -static int msi_laptop_resume(struct platform_device *device) +static int msi_laptop_resume(struct device *device) { u8 data; int result; |
