rtc: snvs: fix build with CONFIG_PM_SLEEP disabled
authorGuenter Roeck <linux@roeck-us.net>
Sat, 13 Dec 2014 00:54:12 +0000 (16:54 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2014 20:42:45 +0000 (12:42 -0800)
Commit 7654e9d4fd8f ("drivers/rtc/rtc-snvs: fix suspend/resume")
replaces SIMPLE_DEV_PM_OPS with direct declaration of snvs_rtc_pm_ops,
but does so outside #ifdef CONFIG_PM_SLEEP.  This causes the driver
build to fail if CONFIG_PM_SLEEP is not configured.

Fixes: 7654e9d4fd8f ("drivers/rtc/rtc-snvs: fix suspend/resume")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: Sanchayan Maity <maitysanchayan@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-snvs.c

index 2cd8ffe..942b267 100644 (file)
@@ -344,13 +344,20 @@ static int snvs_rtc_resume(struct device *dev)
 
        return 0;
 }
-#endif
 
 static const struct dev_pm_ops snvs_rtc_pm_ops = {
        .suspend_noirq = snvs_rtc_suspend,
        .resume_noirq = snvs_rtc_resume,
 };
 
+#define SNVS_RTC_PM_OPS        (&snvs_rtc_pm_ops)
+
+#else
+
+#define SNVS_RTC_PM_OPS        NULL
+
+#endif
+
 static const struct of_device_id snvs_dt_ids[] = {
        { .compatible = "fsl,sec-v4.0-mon-rtc-lp", },
        { /* sentinel */ }
@@ -361,7 +368,7 @@ static struct platform_driver snvs_rtc_driver = {
        .driver = {
                .name   = "snvs_rtc",
                .owner  = THIS_MODULE,
-               .pm     = &snvs_rtc_pm_ops,
+               .pm     = SNVS_RTC_PM_OPS,
                .of_match_table = snvs_dt_ids,
        },
        .probe          = snvs_rtc_probe,