diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-05-06 20:37:42 +0300 |
| commit | cebeb0f1885fa93c44be5d4e0b9b640210ff088c (patch) | |
| tree | a33e4af4ddaa7a57f997ab9a2baceb48209670cd /drivers/acpi/fan.c | |
| parent | 939ecf6b14c46e3448411a934418311b492bfee4 (diff) | |
| parent | 48d11dc37977614a461bfedddc52d1c651bc279f (diff) | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 1fb62900f32a9..8acf53e629660 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c @@ -55,8 +55,16 @@ MODULE_DEVICE_TABLE(acpi, fan_device_ids); #ifdef CONFIG_PM_SLEEP static int acpi_fan_suspend(struct device *dev); static int acpi_fan_resume(struct device *dev); +static struct dev_pm_ops acpi_fan_pm = { + .resume = acpi_fan_resume, + .freeze = acpi_fan_suspend, + .thaw = acpi_fan_resume, + .restore = acpi_fan_resume, +}; +#define FAN_PM_OPS_PTR (&acpi_fan_pm) +#else +#define FAN_PM_OPS_PTR NULL #endif -static SIMPLE_DEV_PM_OPS(acpi_fan_pm, acpi_fan_suspend, acpi_fan_resume); static struct acpi_driver acpi_fan_driver = { .name = "fan", @@ -66,7 +74,7 @@ static struct acpi_driver acpi_fan_driver = { .add = acpi_fan_add, .remove = acpi_fan_remove, }, - .drv.pm = &acpi_fan_pm, + .drv.pm = FAN_PM_OPS_PTR, }; /* thermal cooling device callbacks */ |