rtc: snvs: Fix build with CONFIG_PM_SLEEP disabled

PATCH New Guenter Roeck 1 participant 1 message Dec 11, 2014 Real time clock (RTC)

Share & tools

Guenter Roeck

author

2014-12-11 19:42 UTC #0 lore raw

PATCH 1/1 rtc: snvs: Fix build with CONFIG_PM_SLEEP disabled

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")

Cc Sanchayan Maity <[email protected]>

Cc Andrew Morton <[email protected]>

Signed-off-by Guenter Roeck <[email protected]>

---
 drivers/rtc/rtc-snvs.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

drivers/rtc/rtc-snvs.c +9 -2

index 2cd8ffe..942b267 100644
@@ -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,

Signature · 1 line

1.9.1