* [PATCH] ASoC: sirf: provide pm-runtime functions when needed
@ 2014-07-04 15:07 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2014-07-04 15:07 UTC (permalink / raw)
To: broonie; +Cc: Rongjun Ying, alsa-devel, Liam Girdwood, linux-arm-kernel
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>
diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c
index bdf6aae..9693bc2 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ASoC: sirf: provide pm-runtime functions when needed
@ 2014-07-04 15:07 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2014-07-04 15:07 UTC (permalink / raw)
To: linux-arm-kernel
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>
diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c
index bdf6aae..9693bc2 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);
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: sirf: provide pm-runtime functions when needed
2014-07-04 15:07 ` Arnd Bergmann
@ 2014-07-04 19:28 ` Mark Brown
-1 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-07-04 19:28 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Rongjun Ying, alsa-devel, Liam Girdwood, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 303 bytes --]
On Fri, Jul 04, 2014 at 05:07:41PM +0200, Arnd Bergmann wrote:
> 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:
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-04 19:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-04 15:07 [PATCH] ASoC: sirf: provide pm-runtime functions when needed Arnd Bergmann
2014-07-04 15:07 ` Arnd Bergmann
2014-07-04 19:28 ` Mark Brown
2014-07-04 19:28 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.