acerhdf: convert to dev_pm_ops

Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Peter Feuerer <peter@piie.net>
Cc: Andreas Mohr <andi@lisas.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c
index aa298d6ea371d43e2d2eaadfa1aa0f85fafd70c8..5aef16f3384144b9e281ad7939c7b7bdff1036c0 100644 (file)
--- a/drivers/platform/x86/acerhdf.c
+++ b/drivers/platform/x86/acerhdf.c
@@ -52,7 +52,7 @@
  */
 #undef START_IN_KERNEL_MODE
 
-#define DRV_VER "0.5.16"
+#define DRV_VER "0.5.17"
 
 /*
  * According to the Atom N270 datasheet,
@@ -435,7 +435,7 @@ struct thermal_cooling_device_ops acerhdf_cooling_ops = {
 };
 
 /* suspend / resume functionality */
-static int acerhdf_suspend(struct platform_device *dev, pm_message_t state)
+static int acerhdf_suspend(struct device *dev)
 {
        if (kernelmode)
                acerhdf_change_fanstate(ACERHDF_FAN_AUTO);
@@ -446,14 +446,6 @@ static int acerhdf_suspend(struct platform_device *dev, pm_message_t state)
        return 0;
 }
 
-static int acerhdf_resume(struct platform_device *device)
-{
-       if (verbose)
-               pr_notice("resuming\n");
-
-       return 0;
-}
-
 static int __devinit acerhdf_probe(struct platform_device *device)
 {
        return 0;
@@ -464,15 +456,19 @@ static int acerhdf_remove(struct platform_device *device)
        return 0;
 }
 
+static struct dev_pm_ops acerhdf_pm_ops = {
+       .suspend = acerhdf_suspend,
+       .freeze  = acerhdf_suspend,
+};
+
 static struct platform_driver acerhdf_driver = {
        .driver = {
-               .name = "acerhdf",
+               .name  = "acerhdf",
                .owner = THIS_MODULE,
+               .pm    = &acerhdf_pm_ops,
        },
        .probe = acerhdf_probe,
        .remove = acerhdf_remove,
-       .suspend = acerhdf_suspend,
-       .resume = acerhdf_resume,
 };