android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

msi-laptop: Use struct dev_pm_ops for power management

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki 2012-07-06 19:06:19 +02:00
parent e25d5c11ee
commit 9033132ddf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/platform/x86/msi-laptop.c
View File

@ -85,7 +85,8 @@
#define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4 #define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4
#define MSI_STANDARD_EC_TOUCHPAD_MASK (1 << 4) #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 #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS 0x2f
@ -437,8 +438,8 @@ static struct platform_driver msipf_driver = {
.driver = { .driver = {
.name = "msi-laptop-pf", .name = "msi-laptop-pf",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &msi_laptop_pm,
}, },
.resume = msi_laptop_resume,
}; };
static struct platform_device *msipf_device; static struct platform_device *msipf_device;
@ -752,7 +753,7 @@ static int rfkill_init(struct platform_device *sdev)
return retval; return retval;
} }
static int msi_laptop_resume(struct platform_device *device) static int msi_laptop_resume(struct device *device)
{ {
u8 data; u8 data;
int result; int result;