From: Jingoo Han Date: Tue, 26 Mar 2013 23:25:44 +0000 (+1100) Subject: rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS X-Git-Tag: next-20130404~3^2~161 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=95dc517776ed2c0d3c2fbddb8f51300f0ad3f6dc;p=karo-tx-linux.git rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS Switch to using the SIMPLE_DEV_PM_OPS macro to declare the driver's pm_ops. It reduces code size. Also, CONFIG_PM_SLEEP is added to prevent build warning when CONFIG_PM_SLEEP is not selected. Signed-off-by: Jingoo Han Signed-off-by: Andrew Morton --- diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 5f4708522f4d..8d5bd2e36776 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c @@ -790,6 +790,7 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled) } } +#ifdef CONFIG_PM_SLEEP static int sh_rtc_suspend(struct device *dev) { if (device_may_wakeup(dev)) @@ -805,17 +806,15 @@ static int sh_rtc_resume(struct device *dev) return 0; } +#endif -static const struct dev_pm_ops sh_rtc_dev_pm_ops = { - .suspend = sh_rtc_suspend, - .resume = sh_rtc_resume, -}; +static SIMPLE_DEV_PM_OPS(sh_rtc_pm_ops, sh_rtc_suspend, sh_rtc_resume); static struct platform_driver sh_rtc_platform_driver = { .driver = { .name = DRV_NAME, .owner = THIS_MODULE, - .pm = &sh_rtc_dev_pm_ops, + .pm = &sh_rtc_pm_ops, }, .remove = __exit_p(sh_rtc_remove), };