Commit 90eb1ab9 authored Jul 04, 2014 by Arnd Bergmann Committed by Mark Brown Jul 04, 2014

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>

parent 374a6679

sound/soc/sirf/sirf-usp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);