diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-04 12:26:14 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-04 13:51:04 -0500 |
commit | fa3e44f391149dd49fd053aef55c42479753d45a (patch) | |
tree | 3f81b207ec2cebd0c1bb505356f0d49b8b11c719 /drivers/input/touchscreen/atmel-wm97xx.c | |
parent | 0c0c440f4d2dcfd7913eb77c43aa292b1b5b8130 (diff) |
Input: atmel-wm97xx - convert to dev_pm_ops
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/atmel-wm97xx.c')
-rw-r--r-- | drivers/input/touchscreen/atmel-wm97xx.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 746bf77d7856..429c4305ca52 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
@@ -392,9 +392,10 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) | |||
392 | return 0; | 392 | return 0; |
393 | } | 393 | } |
394 | 394 | ||
395 | #ifdef CONFIG_PM | 395 | #ifdef CONFIG_PM_SLEEP |
396 | static int atmel_wm97xx_suspend(struct platform_device *pdev, pm_message_t msg) | 396 | static int atmel_wm97xx_suspend(struct *dev) |
397 | { | 397 | { |
398 | struct platform_device *pdev = to_platform_device(dev); | ||
398 | struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); | 399 | struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); |
399 | 400 | ||
400 | ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT); | 401 | ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT); |
@@ -404,8 +405,9 @@ static int atmel_wm97xx_suspend(struct platform_device *pdev, pm_message_t msg) | |||
404 | return 0; | 405 | return 0; |
405 | } | 406 | } |
406 | 407 | ||
407 | static int atmel_wm97xx_resume(struct platform_device *pdev) | 408 | static int atmel_wm97xx_resume(struct device *dev) |
408 | { | 409 | { |
410 | struct platform_device *pdev = to_platform_device(dev); | ||
409 | struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); | 411 | struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); |
410 | struct wm97xx *wm = atmel_wm97xx->wm; | 412 | struct wm97xx *wm = atmel_wm97xx->wm; |
411 | 413 | ||
@@ -416,19 +418,18 @@ static int atmel_wm97xx_resume(struct platform_device *pdev) | |||
416 | 418 | ||
417 | return 0; | 419 | return 0; |
418 | } | 420 | } |
419 | #else | ||
420 | #define atmel_wm97xx_suspend NULL | ||
421 | #define atmel_wm97xx_resume NULL | ||
422 | #endif | 421 | #endif |
423 | 422 | ||
423 | static SIMPLE_DEV_PM_OPS(atmel_wm97xx_pm_ops, | ||
424 | atmel_wm97xx_suspend, atmel_wm97xx_resume); | ||
425 | |||
424 | static struct platform_driver atmel_wm97xx_driver = { | 426 | static struct platform_driver atmel_wm97xx_driver = { |
425 | .remove = __exit_p(atmel_wm97xx_remove), | 427 | .remove = __exit_p(atmel_wm97xx_remove), |
426 | .driver = { | 428 | .driver = { |
427 | .name = "wm97xx-touch", | 429 | .name = "wm97xx-touch", |
428 | .owner = THIS_MODULE, | 430 | .owner = THIS_MODULE, |
431 | .pm = &atmel_wm97xx_pm_ops, | ||
429 | }, | 432 | }, |
430 | .suspend = atmel_wm97xx_suspend, | ||
431 | .resume = atmel_wm97xx_resume, | ||
432 | }; | 433 | }; |
433 | module_platform_driver(atmel_wm97xx_driver); | 434 | module_platform_driver(atmel_wm97xx_driver); |
434 | 435 | ||