diff options
Diffstat (limited to 'drivers/platform/x86/msi-laptop.c')
| -rw-r--r-- | drivers/platform/x86/msi-laptop.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index bb5132128b3..2111dbb7e1e 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c @@ -85,7 +85,10 @@ #define MSI_STANDARD_EC_TOUCHPAD_ADDRESS 0xe4 #define MSI_STANDARD_EC_TOUCHPAD_MASK (1 << 4) -static int msi_laptop_resume(struct platform_device *device); +#ifdef CONFIG_PM_SLEEP +static int msi_laptop_resume(struct device *device); +#endif +static SIMPLE_DEV_PM_OPS(msi_laptop_pm, NULL, msi_laptop_resume); #define MSI_STANDARD_EC_DEVICES_EXISTS_ADDRESS 0x2f @@ -437,8 +440,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 +755,8 @@ err_bluetooth: return retval; } -static int msi_laptop_resume(struct platform_device *device) +#ifdef CONFIG_PM_SLEEP +static int msi_laptop_resume(struct device *device) { u8 data; int result; @@ -772,6 +776,7 @@ static int msi_laptop_resume(struct platform_device *device) return 0; } +#endif static int __init msi_laptop_input_setup(void) { |