When CONFIG_PM_SLEEP is disabled, we get a build error in the cppi41 dmaengine driver, since the runtime-pm functions are hidden within the wrong #ifdef:
drivers/dma/cppi41.c:1158:21: error: 'cppi41_runtime_suspend' undeclared here (not in a function) This removes the #ifdef and instead uses __maybe_unused annotations that cannot have this problem. Signed-off-by: Arnd Bergmann <[email protected]> Fixes: fdea2d09b997 ("dmaengine: cppi41: Add basic PM runtime support") --- drivers/dma/cppi41.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index ce8739fa3894..e6c3ba539c80 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -1090,8 +1090,7 @@ static int cppi41_dma_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int cppi41_suspend(struct device *dev) +static int __maybe_unused cppi41_suspend(struct device *dev) { struct cppi41_dd *cdd = dev_get_drvdata(dev); @@ -1102,7 +1101,7 @@ static int cppi41_suspend(struct device *dev) return 0; } -static int cppi41_resume(struct device *dev) +static int __maybe_unused cppi41_resume(struct device *dev) { struct cppi41_dd *cdd = dev_get_drvdata(dev); struct cppi41_channel *c; @@ -1127,7 +1126,7 @@ static int cppi41_resume(struct device *dev) return 0; } -static int cppi41_runtime_suspend(struct device *dev) +static int __maybe_unused cppi41_runtime_suspend(struct device *dev) { struct cppi41_dd *cdd = dev_get_drvdata(dev); @@ -1136,7 +1135,7 @@ static int cppi41_runtime_suspend(struct device *dev) return 0; } -static int cppi41_runtime_resume(struct device *dev) +static int __maybe_unused cppi41_runtime_resume(struct device *dev) { struct cppi41_dd *cdd = dev_get_drvdata(dev); struct cppi41_channel *c, *_c; @@ -1151,7 +1150,6 @@ static int cppi41_runtime_resume(struct device *dev) return 0; } -#endif static const struct dev_pm_ops cppi41_pm_ops = { SET_LATE_SYSTEM_SLEEP_PM_OPS(cppi41_suspend, cppi41_resume) -- 2.9.0
