OSDN Git Service

hwmon: (exynos4_tmu) Use struct dev_pm_ops for power management
authorRafael J. Wysocki <rjw@sisk.pl>
Sun, 8 Jul 2012 19:48:15 +0000 (21:48 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 22 Jul 2012 04:48:44 +0000 (21:48 -0700)
Make the Exynos4 TMU 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>
drivers/hwmon/exynos4_tmu.c

index f2359a0..e912059 100644 (file)
@@ -475,35 +475,39 @@ static int __devexit exynos4_tmu_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int exynos4_tmu_suspend(struct platform_device *pdev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int exynos4_tmu_suspend(struct device *dev)
 {
-       exynos4_tmu_control(pdev, false);
+       exynos4_tmu_control(to_platform_device(dev), false);
 
        return 0;
 }
 
-static int exynos4_tmu_resume(struct platform_device *pdev)
+static int exynos4_tmu_resume(struct device *dev)
 {
+       struct platform_device *pdev = to_platform_device(dev);
+
        exynos4_tmu_initialize(pdev);
        exynos4_tmu_control(pdev, true);
 
        return 0;
 }
+
+static SIMPLE_DEV_PM_OPS(exynos4_tmu_pm,
+                        exynos4_tmu_suspend, exynos4_tmu_resume);
+#define EXYNOS4_TMU_PM &exynos4_tmu_pm
 #else
-#define exynos4_tmu_suspend NULL
-#define exynos4_tmu_resume NULL
+#define EXYNOS4_TMU_PM NULL
 #endif
 
 static struct platform_driver exynos4_tmu_driver = {
        .driver = {
                .name   = "exynos4-tmu",
                .owner  = THIS_MODULE,
+               .pm     = EXYNOS4_TMU_PM,
        },
        .probe = exynos4_tmu_probe,
        .remove = __devexit_p(exynos4_tmu_remove),
-       .suspend = exynos4_tmu_suspend,
-       .resume = exynos4_tmu_resume,
 };
 
 module_platform_driver(exynos4_tmu_driver);