diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2009-07-21 22:47:32 +0200 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-09-10 19:15:35 +0800 |
| commit | e6e698a4fb3cbeef9f478f9f165998246d9b1b0b (patch) | |
| tree | ee633cdc4acf391467ae2593c8d52a8c8484b93e /drivers/rtc | |
| parent | 752807871ad27520d31baec1800f1db59e84f2a1 (diff) | |
| download | op-kernel-dev-e6e698a4fb3cbeef9f478f9f165998246d9b1b0b.zip op-kernel-dev-e6e698a4fb3cbeef9f478f9f165998246d9b1b0b.tar.gz | |
[ARM] pxa: update rtc-pxa.c to use 'struct dev_pm_ops'
Remove the following warning:
Platform driver 'pxa-rtc' needs updating - please use dev_pm_ops
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-pxa.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index bb8cc05..747ca19 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c @@ -438,34 +438,37 @@ static int __exit pxa_rtc_remove(struct platform_device *pdev) } #ifdef CONFIG_PM -static int pxa_rtc_suspend(struct platform_device *pdev, pm_message_t state) +static int pxa_rtc_suspend(struct device *dev) { - struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev); + struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - if (device_may_wakeup(&pdev->dev)) + if (device_may_wakeup(dev)) enable_irq_wake(pxa_rtc->irq_Alrm); return 0; } -static int pxa_rtc_resume(struct platform_device *pdev) +static int pxa_rtc_resume(struct device *dev) { - struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev); + struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev); - if (device_may_wakeup(&pdev->dev)) + if (device_may_wakeup(dev)) disable_irq_wake(pxa_rtc->irq_Alrm); return 0; } -#else -#define pxa_rtc_suspend NULL -#define pxa_rtc_resume NULL + +static struct dev_pm_ops pxa_rtc_pm_ops = { + .suspend = pxa_rtc_suspend, + .resume = pxa_rtc_resume, +}; #endif static struct platform_driver pxa_rtc_driver = { .remove = __exit_p(pxa_rtc_remove), - .suspend = pxa_rtc_suspend, - .resume = pxa_rtc_resume, .driver = { - .name = "pxa-rtc", + .name = "pxa-rtc", +#ifdef CONFIG_PM + .pm = &pxa_rtc_pm_ops, +#endif }, }; |
