diff options
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/hp-wmi.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index a2ad53e15874..af04f5b049db 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c | |||
@@ -53,7 +53,7 @@ MODULE_ALIAS("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4"); | |||
53 | 53 | ||
54 | static int __init hp_wmi_bios_setup(struct platform_device *device); | 54 | static int __init hp_wmi_bios_setup(struct platform_device *device); |
55 | static int __exit hp_wmi_bios_remove(struct platform_device *device); | 55 | static int __exit hp_wmi_bios_remove(struct platform_device *device); |
56 | static int hp_wmi_resume_handler(struct platform_device *device); | 56 | static int hp_wmi_resume_handler(struct device *device); |
57 | 57 | ||
58 | struct bios_args { | 58 | struct bios_args { |
59 | u32 signature; | 59 | u32 signature; |
@@ -94,14 +94,19 @@ static struct rfkill *wifi_rfkill; | |||
94 | static struct rfkill *bluetooth_rfkill; | 94 | static struct rfkill *bluetooth_rfkill; |
95 | static struct rfkill *wwan_rfkill; | 95 | static struct rfkill *wwan_rfkill; |
96 | 96 | ||
97 | static struct dev_pm_ops hp_wmi_pm_ops = { | ||
98 | .resume = hp_wmi_resume_handler, | ||
99 | .restore = hp_wmi_resume_handler, | ||
100 | }; | ||
101 | |||
97 | static struct platform_driver hp_wmi_driver = { | 102 | static struct platform_driver hp_wmi_driver = { |
98 | .driver = { | 103 | .driver = { |
99 | .name = "hp-wmi", | 104 | .name = "hp-wmi", |
100 | .owner = THIS_MODULE, | 105 | .owner = THIS_MODULE, |
106 | .pm = &hp_wmi_pm_ops, | ||
101 | }, | 107 | }, |
102 | .probe = hp_wmi_bios_setup, | 108 | .probe = hp_wmi_bios_setup, |
103 | .remove = hp_wmi_bios_remove, | 109 | .remove = hp_wmi_bios_remove, |
104 | .resume = hp_wmi_resume_handler, | ||
105 | }; | 110 | }; |
106 | 111 | ||
107 | static int hp_wmi_perform_query(int query, int write, int value) | 112 | static int hp_wmi_perform_query(int query, int write, int value) |
@@ -512,7 +517,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device) | |||
512 | return 0; | 517 | return 0; |
513 | } | 518 | } |
514 | 519 | ||
515 | static int hp_wmi_resume_handler(struct platform_device *device) | 520 | static int hp_wmi_resume_handler(struct device *device) |
516 | { | 521 | { |
517 | /* | 522 | /* |
518 | * Hardware state may have changed while suspended, so trigger | 523 | * Hardware state may have changed while suspended, so trigger |