diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:17:57 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-05 01:19:37 -0500 |
commit | 3db8a537c6e2270bb09aadc229407b3532c57a81 (patch) | |
tree | 361ce42b4382b7288f6080cd83cb3ea88c9972b4 /drivers/input/touchscreen | |
parent | ee9dfd7a1d1256b0f51a0bf54bed0a8927c8e2ea (diff) |
Input: ucb1400_ts - convert to use dev_pm_ops
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>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | 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 cf2440f537ac..dff748d43a8e 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) | |||
428 | return 0; | 428 | return 0; |
429 | } | 429 | } |
430 | 430 | ||
431 | #ifdef CONFIG_PM | 431 | #ifdef CONFIG_PM_SLEEP |
432 | static int ucb1400_ts_resume(struct platform_device *dev) | 432 | static int ucb1400_ts_resume(struct device *dev) |
433 | { | 433 | { |
434 | struct ucb1400_ts *ucb = dev->dev.platform_data; | 434 | struct ucb1400_ts *ucb = dev->platform_data; |
435 | 435 | ||
436 | if (ucb->ts_task) { | 436 | if (ucb->ts_task) { |
437 | /* | 437 | /* |
@@ -444,16 +444,16 @@ static int ucb1400_ts_resume(struct platform_device *dev) | |||
444 | } | 444 | } |
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | #else | ||
448 | #define ucb1400_ts_resume NULL | ||
449 | #endif | 447 | #endif |
450 | 448 | ||
449 | static SIMPLE_DEV_PM_OPS(ucb1400_ts_pm_ops, NULL, ucb1400_ts_resume); | ||
450 | |||
451 | static struct platform_driver ucb1400_ts_driver = { | 451 | static struct platform_driver ucb1400_ts_driver = { |
452 | .probe = ucb1400_ts_probe, | 452 | .probe = ucb1400_ts_probe, |
453 | .remove = ucb1400_ts_remove, | 453 | .remove = ucb1400_ts_remove, |
454 | .resume = ucb1400_ts_resume, | ||
455 | .driver = { | 454 | .driver = { |
456 | .name = "ucb1400_ts", | 455 | .name = "ucb1400_ts", |
456 | .pm = &ucb1400_ts_pm_ops, | ||
457 | }, | 457 | }, |
458 | }; | 458 | }; |
459 | module_platform_driver(ucb1400_ts_driver); | 459 | module_platform_driver(ucb1400_ts_driver); |