ASoC: tegra_wm9712: Use card DAPM context to access widgets
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 3 Apr 2015 11:04:08 +0000 (13:04 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:10:01 +0000 (21:10 +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/tegra/tegra_wm9712.c

index 2868b4839bc0a0e7c8899fa7d4e97b51fce9fa96..6492f8143ff1f172d3bcd5007b3ea1049cdc9e2f 100644 (file)
@@ -46,11 +46,7 @@ static const struct snd_soc_dapm_widget tegra_wm9712_dapm_widgets[] = {
 
 static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_dai *codec_dai = rtd->codec_dai;
-       struct snd_soc_codec *codec = codec_dai->codec;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
-
-       return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
+       return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
 }
 
 static struct snd_soc_dai_link tegra_wm9712_dai = {