diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-04-11 12:52:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-12 12:42:34 +0100 |
| commit | 02f51640fedb61ab17fcddbd6fdb40239a4f46d9 (patch) | |
| tree | a45444cef2b26ccc058a6b8abd0e4f2b94d6d173 /sound/soc/fsl | |
| parent | 77c71765ef78f87dd901fcb4c751908e835a3b2e (diff) | |
| download | linux-02f51640fedb61ab17fcddbd6fdb40239a4f46d9.tar.bz2 | |
ASoC: wm1133-ev1: Use card DAPM context to access widgets
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>
Diffstat (limited to 'sound/soc/fsl')
| -rw-r--r-- | sound/soc/fsl/wm1133-ev1.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c index 0653aa83c927..b454972dce35 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; } |