aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-11-08 10:51:03 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-11-08 10:54:16 +0000
commit60d6dd530a6a31c85af9e37eadcb0f90acc76209 (patch)
tree023f8e847208b009435d83cc738d6a39412c5b68
parent3d70f8c617a436c7146ecb81df2265b4626dfe89 (diff)
downloadlinux-linaro-stable-60d6dd530a6a31c85af9e37eadcb0f90acc76209.tar.gz
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>
-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)
return 0;
}
-#ifdef CONFIG_PM
-static int sp805_wdt_suspend(struct device *dev)
+static int __maybe_unused sp805_wdt_suspend(struct device *dev)
{
struct sp805_wdt *wdt = dev_get_drvdata(dev);
@@ -295,7 +294,7 @@ static int sp805_wdt_suspend(struct device *dev)
return 0;
}
-static int sp805_wdt_resume(struct device *dev)
+static int __maybe_unused sp805_wdt_resume(struct device *dev)
{
struct sp805_wdt *wdt = dev_get_drvdata(dev);
@@ -304,7 +303,6 @@ static int sp805_wdt_resume(struct device *dev)
return 0;
}
-#endif /* CONFIG_PM */
static SIMPLE_DEV_PM_OPS(sp805_wdt_dev_pm_ops, sp805_wdt_suspend,
sp805_wdt_resume);