aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/abituguru3.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-07 18:00:01 -0400
committerGuenter Roeck <linux@roeck-us.net>2012-07-22 00:48:44 -0400
commitc248f24cffc3d6692f428ccc9f2ba76cea1fa6ab (patch)
tree8ba91e3a30e4014e1de3acb54bfd77105b15afce /drivers/hwmon/abituguru3.c
parent4f0928c6652d8b512f81002ebf66ef0b22cf1af4 (diff)
hwmon: (abituguru3) Use struct dev_pm_ops for power management
Make the Abit uGuru rev. 3 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> [linux@roeck-us.net: CONFIG_PM->CONFIG_PM_SLEEP, and remove unnecessary ()] Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/abituguru3.c')
-rw-r--r--drivers/hwmon/abituguru3.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/hwmon/abituguru3.c b/drivers/hwmon/abituguru3.c
index a5bc4287daa6..5d582aebff87 100644
--- a/drivers/hwmon/abituguru3.c
+++ b/drivers/hwmon/abituguru3.c
@@ -1141,10 +1141,10 @@ LEAVE_UPDATE:
1141 return NULL; 1141 return NULL;
1142} 1142}
1143 1143
1144#ifdef CONFIG_PM 1144#ifdef CONFIG_PM_SLEEP
1145static int abituguru3_suspend(struct platform_device *pdev, pm_message_t state) 1145static int abituguru3_suspend(struct device *dev)
1146{ 1146{
1147 struct abituguru3_data *data = platform_get_drvdata(pdev); 1147 struct abituguru3_data *data = dev_get_drvdata(dev);
1148 /* 1148 /*
1149 * make sure all communications with the uguru3 are done and no new 1149 * make sure all communications with the uguru3 are done and no new
1150 * ones are started 1150 * ones are started
@@ -1153,26 +1153,27 @@ static int abituguru3_suspend(struct platform_device *pdev, pm_message_t state)
1153 return 0; 1153 return 0;
1154} 1154}
1155 1155
1156static int abituguru3_resume(struct platform_device *pdev) 1156static int abituguru3_resume(struct device *dev)
1157{ 1157{
1158 struct abituguru3_data *data = platform_get_drvdata(pdev); 1158 struct abituguru3_data *data = dev_get_drvdata(dev);
1159 mutex_unlock(&data->update_lock); 1159 mutex_unlock(&data->update_lock);
1160 return 0; 1160 return 0;
1161} 1161}
1162
1163static SIMPLE_DEV_PM_OPS(abituguru3_pm, abituguru3_suspend, abituguru3_resume);
1164#define ABIT_UGURU3_PM &abituguru3_pm
1162#else 1165#else
1163#define abituguru3_suspend NULL 1166#define ABIT_UGURU3_PM NULL
1164#define abituguru3_resume NULL
1165#endif /* CONFIG_PM */ 1167#endif /* CONFIG_PM */
1166 1168
1167static struct platform_driver abituguru3_driver = { 1169static struct platform_driver abituguru3_driver = {
1168 .driver = { 1170 .driver = {
1169 .owner = THIS_MODULE, 1171 .owner = THIS_MODULE,
1170 .name = ABIT_UGURU3_NAME, 1172 .name = ABIT_UGURU3_NAME,
1173 .pm = ABIT_UGURU3_PM
1171 }, 1174 },
1172 .probe = abituguru3_probe, 1175 .probe = abituguru3_probe,
1173 .remove = __devexit_p(abituguru3_remove), 1176 .remove = __devexit_p(abituguru3_remove),
1174 .suspend = abituguru3_suspend,
1175 .resume = abituguru3_resume
1176}; 1177};
1177 1178
1178static int __init abituguru3_dmi_detect(void) 1179static int __init abituguru3_dmi_detect(void)