Input: ucb1400_ts - convert to use dev_pm_ops
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 5 Jan 2012 06:17:57 +0000 (22:17 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 5 Jan 2012 06:19:37 +0000 (22:19 -0800)
Instead of using legacy PM interfaces switch to using dev_pm_ops.

Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
drivers/input/touchscreen/ucb1400_ts.c

index cf2440f537ac56d148e44b34a4cf9b13b4c7013f..dff748d43a8e183f3ad69c316ca7e6d4b79b2a70 100644 (file)
@@ -428,10 +428,10 @@ static int ucb1400_ts_remove(struct platform_device *dev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int ucb1400_ts_resume(struct platform_device *dev)
+#ifdef CONFIG_PM_SLEEP
+static int ucb1400_ts_resume(struct device *dev)
 {
-       struct ucb1400_ts *ucb = dev->dev.platform_data;
+       struct ucb1400_ts *ucb = dev->platform_data;
 
        if (ucb->ts_task) {
                /*
@@ -444,16 +444,16 @@ static int ucb1400_ts_resume(struct platform_device *dev)
        }
        return 0;
 }
-#else
-#define ucb1400_ts_resume NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, NULL, ucb1400_ts_resume);
+
 static struct platform_driver ucb1400_ts_driver = {
        .probe  = ucb1400_ts_probe,
        .remove = ucb1400_ts_remove,
-       .resume = ucb1400_ts_resume,
        .driver = {
                .name   = "ucb1400_ts",
+               .pm     = &ucb1400_ts_pm_ops,
        },
 };
 module_platform_driver(ucb1400_ts_driver);