| Message ID | 1428749521-7426-1-git-send-email-lars@metafoo.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 02f51640fedb61ab17fcddbd6fdb40239a4f46d9 |
| Headers | show |
On Sat, Apr 11, 2015 at 12:52:01PM +0200, Lars-Peter Clausen wrote: > The dapm field of the snd_soc_codec struct will eventually be removed > (replaced with the DAPM context from the component embedded inside the > CODEC). Replace its usage with the card's DAPM context. The idea is that > DAPM is hierarchical and with the card at the root it is possible to access > widgets from other contexts through the card context. Applied, thanks.
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c index 0653aa8..b454972 100644 --- a/sound/soc/fsl/wm1133-ev1.c +++ b/sound/soc/fsl/wm1133-ev1.c @@ -202,7 +202,6 @@ static struct snd_soc_jack_pin mic_jack_pins[] = { static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; /* Headphone jack detection */ snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE, @@ -216,7 +215,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, SND_JACK_BTN_0); - snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); + snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias"); return 0; }
The dapm field of the snd_soc_codec struct will eventually be removed (replaced with the DAPM context from the component embedded inside the CODEC). Replace its usage with the card's DAPM context. The idea is that DAPM is hierarchical and with the card at the root it is possible to access widgets from other contexts through the card context. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- sound/soc/fsl/wm1133-ev1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)