[PATCH] thermal: ti-soc-thermal: fix compilation warnings when !CONFIG_PM_SLEEP

From: Paul Walmsley
Date: Fri Feb 06 2015 - 19:18:06 EST



When CONFIG_PM_SLEEP=n, the following compilation warnings appear:

drivers/thermal/ti-soc-thermal/ti-bandgap.c:1478:12: warning: ʽti_bandgap_suspendʼ defined but not used [-Wunused-function]
static int ti_bandgap_suspend(struct device *dev)
^
drivers/thermal/ti-soc-thermal/ti-bandgap.c:1492:12: warning: ʽti_bandgap_resumeʼ defined but not used [-Wunused-function]
static int ti_bandgap_resume(struct device *dev)

A few years ago, suspend/resume-related code was protected by CONFIG_PM.
But that was changed and now it's protected by CONFIG_PM_SLEEP. Fix the
warnings by converting the preprocessor test in the TI bandgap thermal
sensor driver from testing CONFIG_PM to testing CONFIG_PM_SLEEP.

Signed-off-by: Paul Walmsley <paul@xxxxxxxxx>
Cc: Eduardo Valentin <edubezval@xxxxxxxxx>
Cc: Zhang Rui <rui.zhang@xxxxxxxxx>
Cc: linux-pm@xxxxxxxxxxxxxxx
Cc: linux-omap@xxxxxxxxxxxxxxx
Cc: linux-kernel@xxxxxxxxxxxxxxx
---

Non-critical. Targeted for either v3.20-rc1 or v3.21-rc1.

Basic test reports for a series that includes this patch (and a few other
unrelated warning cleanups) is available here:

http://www.pwsan.com/omap/testlogs/fix-omap-warnings-v3.21/20150206154619/

Compare to:

http://www.pwsan.com/omap/testlogs/test_v3.19-rc7/20150204213018/

drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/thermal/ti-soc-thermal/ti-bandgap.c b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
index 634b6ce0e63a..62a5d449c388 100644
--- a/drivers/thermal/ti-soc-thermal/ti-bandgap.c
+++ b/drivers/thermal/ti-soc-thermal/ti-bandgap.c
@@ -1402,7 +1402,7 @@ int ti_bandgap_remove(struct platform_device *pdev)
return 0;
}

-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int ti_bandgap_save_ctxt(struct ti_bandgap *bgp)
{
int i;
--
2.1.4