Re: [PATCH 1/6] Input: ucb1400_ts - convert to use dev_pm_ops

On Mon, Nov 14, 2011 at 11:39:17AM +0100, Marek Vasut wrote:

quoted

quoted

Instead of using legacy PM interfaces switch to using dev_pm_ops.

Signed-off-by: Dmitry Torokhov <redacted>
---

 drivers/input/touchscreen/ucb1400_ts.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/input/touchscreen/ucb1400_ts.c

b/drivers/input/touchscreen/ucb1400_ts.c index 3b5b5df..ead7123 100644

--- a/drivers/input/touchscreen/ucb1400_ts.c
+++ b/drivers/input/touchscreen/ucb1400_ts.c

@@ -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,

 	},
 
 };

Hi,

I went through the patchset, but didn't test it. Though the changes look
reasonable. I'll have time to test this sometimes next week MAYBE, or it
MIGHT tell someone else to test, I can't promise anything here though.

Please add to all patches my:

Reviewed-by: Marek Vasut <redacted>

Thanks Marek. I have not tested these either so it would be nice to find
someone who could. However there is no urgency as we have some time
before 3.3 merge window opens.

I can, I have devices with this chip available ... just not now, real life is 
haunting me :)

Thanks.

Sure.

M