aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-11-08 05:51:03 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-11-08 05:54:16 -0500
commit60d6dd530a6a31c85af9e37eadcb0f90acc76209 (patch)
tree023f8e847208b009435d83cc738d6a39412c5b68 /drivers/watchdog
parent3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff)
WATCHDOG: fix build PM warnings
drivers/watchdog/sp805_wdt.c:288:12: warning: 'sp805_wdt_suspend' defined but not used drivers/watchdog/sp805_wdt.c:298:12: warning: 'sp805_wdt_resume' defined but not used This is caused by the wrong config symbol being used for these functions. Rather than fixing that, mark the functions with __maybe_unused Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/sp805_wdt.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c
index e4841c36798b..dfddfbf5d9fe 100644
--- a/drivers/watchdog/sp805_wdt.c
+++ b/drivers/watchdog/sp805_wdt.c
@@ -284,8 +284,7 @@ static int __devexit sp805_wdt_remove(struct amba_device *adev)
284 return 0; 284 return 0;
285} 285}
286 286
287#ifdef CONFIG_PM 287static int __maybe_unused sp805_wdt_suspend(struct device *dev)
288static int sp805_wdt_suspend(struct device *dev)
289{ 288{
290 struct sp805_wdt *wdt = dev_get_drvdata(dev); 289 struct sp805_wdt *wdt = dev_get_drvdata(dev);
291 290
@@ -295,7 +294,7 @@ static int sp805_wdt_suspend(struct device *dev)
295 return 0; 294 return 0;
296} 295}
297 296
298static int sp805_wdt_resume(struct device *dev) 297static int __maybe_unused sp805_wdt_resume(struct device *dev)
299{ 298{
300 struct sp805_wdt *wdt = dev_get_drvdata(dev); 299 struct sp805_wdt *wdt = dev_get_drvdata(dev);
301 300
@@ -304,7 +303,6 @@ static int sp805_wdt_resume(struct device *dev)
304 303
305 return 0; 304 return 0;
306} 305}
307#endif /* CONFIG_PM */
308 306
309static SIMPLE_DEV_PM_OPS(sp805_wdt_dev_pm_ops, sp805_wdt_suspend, 307static SIMPLE_DEV_PM_OPS(sp805_wdt_dev_pm_ops, sp805_wdt_suspend,
310 sp805_wdt_resume); 308 sp805_wdt_resume);