summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-17 13:48:25 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-03-17 13:48:25 +0100
commitc730d30c313a24d9f8829cd2a4047c3eb8b89fec (patch)
treeee8aeb498a64bd20488960cb380733f31c08ec38 /drivers/acpi
parent2eb060975df2aaca635801dcfb99eaa45ede98fe (diff)
parentb9b8515f34fa182e26ee934c3a83f24e2d8bd846 (diff)
Merge branch 'acpi-fan'
* acpi-fan: ACPI / fan: do nothing in suspend and poweroff callback
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/fan.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index 09e423f3d8a..8acf53e6296 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -55,11 +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 acpi_fan_suspend NULL
-#define acpi_fan_resume NULL
+#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",
@@ -69,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 */