summaryrefslogtreecommitdiffstats
path: root/sound/soc/sirf
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-07-04 17:07:41 +0200
committerMark Brown <broonie@linaro.org>2014-07-04 20:28:44 +0100
commit90eb1ab9e40c2d7596d9160151f6df4b5a71645f (patch)
tree85ea0b23ffda55d5e0fd58ce58736f47e47a9a23 /sound/soc/sirf
parent374a6679bef2e79fc2a27eea79b0400295e39df0 (diff)
downloadlinux-90eb1ab9e40c2d7596d9160151f6df4b5a71645f.tar.bz2
ASoC: sirf: provide pm-runtime functions when needed
The newly introduced sirf-usp driver defines sirf_usp_pcm_{suspend,resume} functions only when PM_RUNTIME is enabled, but also uses them when that is disabled and only PM_SLEEP is turned on, resulting in this error: ../sound/soc/sirf/sirf-usp.c: In function 'sirf_usp_pcm_suspend': ../sound/soc/sirf/sirf-usp.c:308:3: error: implicit declaration of function 'sirf_usp_pcm_runtime_suspend' [-Werror=implicit-function-declaration] sirf_usp_pcm_runtime_suspend(dev); ^ ../sound/soc/sirf/sirf-usp.c: In function 'sirf_usp_pcm_resume': ../sound/soc/sirf/sirf-usp.c:319:3: error: implicit declaration of function 'sirf_usp_pcm_runtime_resume' [-Werror=implicit-function-declaration] ret = sirf_usp_pcm_runtime_resume(dev); ^ cc1: some warnings being treated as errors To fix that, this patch changes the #ifdef to CONFIG_PM, which is enabled when at least one of PM_SLEEP or PM_RUNTIME are enabled. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/sirf')
-rw-r--r--sound/soc/sirf/sirf-usp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c
index bdf6aae3e6d0..9693bc2a796d 100644
--- a/sound/soc/sirf/sirf-usp.c
+++ b/sound/soc/sirf/sirf-usp.c
@@ -282,7 +282,7 @@ static struct snd_soc_dai_driver sirf_usp_pcm_dai = {
.ops = &sirf_usp_pcm_dai_ops,
};
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
static int sirf_usp_pcm_runtime_suspend(struct device *dev)
{
struct sirf_usp *usp = dev_get_drvdata(dev);