rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:20:00 +0000 (16:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:32 +0000 (18:28 -0700)
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 <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-sh.c

index 5f4708522f4dfa2464cb6b8b161ee861139ae587..8d5bd2e367765e55fadedd78c86df0bbfee62d29 100644 (file)
@@ -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),
 };