[PATCH] drivers/rtc/rtc-cmos.c: fix compilation warning when !CONFIG_PM_SLEEP

From: Mika Westerberg
Date: Thu Jan 16 2014 - 07:44:50 EST


CONFIG_PM will be set also if only CONFIG_PM_RUNTIME is set which causes
the compiler to emit following warning:

drivers/rtc/rtc-cmos.c:845:12: warning: âcmos_resumeâ defined but not used [-Wunused-function]

Fix this by using CONFIG_PM_SLEEP instead of CONFIG_PM and removing it from
the driver pm ops as this has been taken care by SIMPLE_DEV_PM_OPS()
already.

Signed-off-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-cmos.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f14876256a4a..8d3b80d5f337 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -791,7 +791,7 @@ static void __exit cmos_do_remove(struct device *dev)
cmos->dev = NULL;
}

-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP

static int cmos_suspend(struct device *dev)
{
@@ -889,8 +889,6 @@ static int cmos_resume(struct device *dev)
return 0;
}

-static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
-
#else

static inline int cmos_poweroff(struct device *dev)
@@ -900,6 +898,8 @@ static inline int cmos_poweroff(struct device *dev)

#endif

+static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
+
/*----------------------------------------------------------------*/

/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus.
@@ -1042,11 +1042,9 @@ static struct pnp_driver cmos_pnp_driver = {

/* flag ensures resume() gets called, and stops syslog spam */
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
-#ifdef CONFIG_PM_SLEEP
.driver = {
.pm = &cmos_pm_ops,
},
-#endif
};

#endif /* CONFIG_PNP */
--
1.8.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/