summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2015-04-03 13:04:08 +0200
committerMark Brown <broonie@kernel.org>2015-04-08 21:10:01 +0100
commit1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38 (patch)
tree18d4f1688a885884bea0bbcefa56fd9347ea2260 /sound
parent14e954f5ddc56c0dc9c32fadf188f44f5855e0fa (diff)
downloadlinux-1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38.tar.gz
linux-1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38.tar.bz2
linux-1b13fe718b6ebca2b12cfa3d6cd32b8b68a03e38.zip
ASoC: tegra_wm9712: 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')
-rw-r--r--sound/soc/tegra/tegra_wm9712.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/tegra/tegra_wm9712.c b/sound/soc/tegra/tegra_wm9712.c
index 2868b4839bc0..6492f8143ff1 100644
--- a/sound/soc/tegra/tegra_wm9712.c
+++ b/sound/soc/tegra/tegra_wm9712.c
@@ -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 = {