[1/8] ASoC: pxa: Pass correct DAPM context to {corgi, poodle, spitz}_ext_control

Commit Message

Lars-Peter Clausen March 1, 2014, 2:48 p.m. UTC

When calling {corgi,poodle,spitz}_ext_control() from the startup callback we
pass the CODEC's DAPM context instead of the card's DAPM context. This is not a
problem per se since all the DAPM functions in ext_control() fallback to widgets
from other DAPM contexts, but passing the card's context is more consistent.

Signed-off-by: Lars-Peter Clausen <[e-mail]>
---
 sound/soc/pxa/corgi.c  | 3 +--
 sound/soc/pxa/poodle.c | 3 +--
 sound/soc/pxa/spitz.c  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

Comments

Mark Brown March 3, 2014, 2:04 a.m. UTC | #1

On Sat, Mar 01, 2014 at 03:48:13PM +0100, Lars-Peter Clausen wrote:
> When calling {corgi,poodle,spitz}_ext_control() from the startup callback we
> pass the CODEC's DAPM context instead of the card's DAPM context. This is not a
> problem per se since all the DAPM functions in ext_control() fallback to widgets
> from other DAPM contexts, but passing the card's context is more consistent.

Applied, thanks.

Patch

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index b4db3b9..5a88136 100644
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -101,10 +101,9 @@  static void corgi_ext_control(struct snd_soc_dapm_context *dapm)
 static int corgi_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	corgi_ext_control(&codec->dapm);
+	corgi_ext_control(&rtd->card->dapm);
 
 	return 0;
 }
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c
index 27c6c03..c6bdc6c 100644
--- a/sound/soc/pxa/poodle.c
+++ b/sound/soc/pxa/poodle.c
@@ -74,10 +74,9 @@  static void poodle_ext_control(struct snd_soc_dapm_context *dapm)
 static int poodle_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	poodle_ext_control(&codec->dapm);
+	poodle_ext_control(&rtd->card->dapm);
 
 	return 0;
 }
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index a3a13c9..1373b01 100644
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -111,10 +111,9 @@  static void spitz_ext_control(struct snd_soc_dapm_context *dapm)
 static int spitz_startup(struct snd_pcm_substream *substream)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_codec *codec = rtd->codec;
 
 	/* check the jack status at stream startup */
-	spitz_ext_control(&codec->dapm);
+	spitz_ext_control(&rtd->card->dapm);
 
 	return 0;
 }