ASoC: wm1133-ev1: Use card DAPM context to access widgets
authorLars-Peter Clausen <lars@metafoo.de>
Sat, 11 Apr 2015 10:52:01 +0000 (12:52 +0200)
committerMark Brown <broonie@kernel.org>
Sun, 12 Apr 2015 11:42:34 +0000 (12:42 +0100)
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/wm1133-ev1.c

index 0653aa83c9273ca6afedfb0c9b8271df6cc79746..b454972dce3521a48cb0762651bc3fad0a234690 100644 (file)
@@ -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;
 }