aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-03-02 10:58:58 -0500
committerVinod Koul <vinod.koul@intel.com>2016-03-04 10:01:35 -0500
commit6ff1cb88a7253ee33116626537a231da528bc57c (patch)
tree605a7df95b57b3d2240ee4d5dc341e8b668e8857
parent333f16ec68f6fc6b208130de22717b585e6f3242 (diff)
dmaengine: sirf: use __maybe_unused to hide pm functions
The sirf dma driver uses #ifdef to check for CONFIG_PM_SLEEP for its suspend/resume code but then has no #ifdef for the respective runtime PM code, so we get a warning if CONFIG_PM is disabled altogether: drivers/dma/sirf-dma.c:1000:12: error: 'sirfsoc_dma_runtime_resume' defined but not used [-Werror=unused-function] This removes the existing #ifdef and instead uses __maybe_unused annotations for all four functions to let the compiler know it can silently drop the function definition. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/sirf-dma.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/dma/sirf-dma.c b/drivers/dma/sirf-dma.c
index 22ea2419ee56..e48350e65089 100644
--- a/drivers/dma/sirf-dma.c
+++ b/drivers/dma/sirf-dma.c
@@ -989,7 +989,7 @@ static int sirfsoc_dma_remove(struct platform_device *op)
989 return 0; 989 return 0;
990} 990}
991 991
992static int sirfsoc_dma_runtime_suspend(struct device *dev) 992static int __maybe_unused sirfsoc_dma_runtime_suspend(struct device *dev)
993{ 993{
994 struct sirfsoc_dma *sdma = dev_get_drvdata(dev); 994 struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
995 995
@@ -997,7 +997,7 @@ static int sirfsoc_dma_runtime_suspend(struct device *dev)
997 return 0; 997 return 0;
998} 998}
999 999
1000static int sirfsoc_dma_runtime_resume(struct device *dev) 1000static int __maybe_unused sirfsoc_dma_runtime_resume(struct device *dev)
1001{ 1001{
1002 struct sirfsoc_dma *sdma = dev_get_drvdata(dev); 1002 struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
1003 int ret; 1003 int ret;
@@ -1010,8 +1010,7 @@ static int sirfsoc_dma_runtime_resume(struct device *dev)
1010 return 0; 1010 return 0;
1011} 1011}
1012 1012
1013#ifdef CONFIG_PM_SLEEP 1013static int __maybe_unused sirfsoc_dma_pm_suspend(struct device *dev)
1014static int sirfsoc_dma_pm_suspend(struct device *dev)
1015{ 1014{
1016 struct sirfsoc_dma *sdma = dev_get_drvdata(dev); 1015 struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
1017 struct sirfsoc_dma_regs *save = &sdma->regs_save; 1016 struct sirfsoc_dma_regs *save = &sdma->regs_save;
@@ -1062,7 +1061,7 @@ static int sirfsoc_dma_pm_suspend(struct device *dev)
1062 return 0; 1061 return 0;
1063} 1062}
1064 1063
1065static int sirfsoc_dma_pm_resume(struct device *dev) 1064static int __maybe_unused sirfsoc_dma_pm_resume(struct device *dev)
1066{ 1065{
1067 struct sirfsoc_dma *sdma = dev_get_drvdata(dev); 1066 struct sirfsoc_dma *sdma = dev_get_drvdata(dev);
1068 struct sirfsoc_dma_regs *save = &sdma->regs_save; 1067 struct sirfsoc_dma_regs *save = &sdma->regs_save;
@@ -1121,7 +1120,6 @@ static int sirfsoc_dma_pm_resume(struct device *dev)
1121 1120
1122 return 0; 1121 return 0;
1123} 1122}
1124#endif
1125 1123
1126static const struct dev_pm_ops sirfsoc_dma_pm_ops = { 1124static const struct dev_pm_ops sirfsoc_dma_pm_ops = {
1127 SET_RUNTIME_PM_OPS(sirfsoc_dma_runtime_suspend, sirfsoc_dma_runtime_resume, NULL) 1125 SET_RUNTIME_PM_OPS(sirfsoc_dma_runtime_suspend, sirfsoc_dma_runtime_resume, NULL)