Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: atmel-wm97xx - convert to dev_pm_ops

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+9 -8
+9 -8
drivers/input/touchscreen/atmel-wm97xx.c
··· 392 392 return 0; 393 393 } 394 394 395 - #ifdef CONFIG_PM 396 - static int atmel_wm97xx_suspend(struct platform_device *pdev, pm_message_t msg) 395 + #ifdef CONFIG_PM_SLEEP 396 + static int atmel_wm97xx_suspend(struct *dev) 397 397 { 398 + struct platform_device *pdev = to_platform_device(dev); 398 399 struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); 399 400 400 401 ac97c_writel(atmel_wm97xx, IDR, AC97C_INT_CBEVT); ··· 405 404 return 0; 406 405 } 407 406 408 - static int atmel_wm97xx_resume(struct platform_device *pdev) 407 + static int atmel_wm97xx_resume(struct device *dev) 409 408 { 409 + struct platform_device *pdev = to_platform_device(dev); 410 410 struct atmel_wm97xx *atmel_wm97xx = platform_get_drvdata(pdev); 411 411 struct wm97xx *wm = atmel_wm97xx->wm; 412 412 ··· 418 416 419 417 return 0; 420 418 } 421 - #else 422 - #define atmel_wm97xx_suspend NULL 423 - #define atmel_wm97xx_resume NULL 424 419 #endif 420 + 421 + static SIMPLE_DEV_PM_OPS(atmel_wm97xx_pm_ops, 422 + atmel_wm97xx_suspend, atmel_wm97xx_resume); 425 423 426 424 static struct platform_driver atmel_wm97xx_driver = { 427 425 .remove = __exit_p(atmel_wm97xx_remove), 428 426 .driver = { 429 427 .name = "wm97xx-touch", 430 428 .owner = THIS_MODULE, 429 + .pm = &atmel_wm97xx_pm_ops, 431 430 }, 432 - .suspend = atmel_wm97xx_suspend, 433 - .resume = atmel_wm97xx_resume, 434 431 }; 435 432 module_platform_driver(atmel_wm97xx_driver); 436 433