tc1100-wmi - switch to using dev_pm_ops
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 4 Dec 2009 08:36:20 +0000 (00:36 -0800)
committerLen Brown <len.brown@intel.com>
Wed, 16 Dec 2009 17:53:33 +0000 (12:53 -0500)
Also guard PM operations with CONFIG_PM.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Len Brown <len.brown@intel.com>
drivers/platform/x86/tc1100-wmi.c

index fa2995bfa1d91855b075f1ba28540d172b81f685..dd33b51c34869b098ee43ce9e63e36b89c3d4a22 100644 (file)
@@ -194,7 +194,8 @@ static int __devexit tc1100_remove(struct platform_device *device)
        return 0;
 }
 
        return 0;
 }
 
-static int tc1100_suspend(struct platform_device *dev, pm_message_t state)
+#ifdef CONFIG_PM
+static int tc1100_suspend(struct device *dev)
 {
        int ret;
 
 {
        int ret;
 
@@ -206,10 +207,10 @@ static int tc1100_suspend(struct platform_device *dev, pm_message_t state)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 
-       return ret;
+       return 0;
 }
 
 }
 
-static int tc1100_resume(struct platform_device *dev)
+static int tc1100_resume(struct device *dev)
 {
        int ret;
 
 {
        int ret;
 
@@ -221,17 +222,26 @@ static int tc1100_resume(struct platform_device *dev)
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 
-       return ret;
+       return 0;
 }
 
 }
 
+static const struct dev_pm_ops tc1100_pm_ops = {
+       .suspend        = tc1100_suspend,
+       .resume         = tc1100_resume,
+       .freeze         = tc1100_suspend,
+       .restore        = tc1100_resume,
+};
+#endif
+
 static struct platform_driver tc1100_driver = {
        .driver = {
                .name = "tc1100-wmi",
                .owner = THIS_MODULE,
 static struct platform_driver tc1100_driver = {
        .driver = {
                .name = "tc1100-wmi",
                .owner = THIS_MODULE,
+#ifdef CONFIG_PM
+               .pm = &tc1100_pm_ops,
+#endif
        },
        .remove = __devexit_p(tc1100_remove),
        },
        .remove = __devexit_p(tc1100_remove),
-       .suspend = tc1100_suspend,
-       .resume = tc1100_resume,
 };
 
 static int __init tc1100_init(void)
 };
 
 static int __init tc1100_init(void)