diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2015-04-03 13:04:05 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 22:10:01 +0200 |
| commit | 884c0f5b2ad542037b6f04de84a3fd3f82b15828 (patch) | |
| tree | be0e94867af16dcbc3910472d62e07450304d09c | |
| parent | Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/br... (diff) | |
| download | linux-884c0f5b2ad542037b6f04de84a3fd3f82b15828.tar.xz linux-884c0f5b2ad542037b6f04de84a3fd3f82b15828.zip | |
ASoC: tegra_alc5632: 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>
| -rw-r--r-- | sound/soc/tegra/tegra_alc5632.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/tegra/tegra_alc5632.c b/sound/soc/tegra/tegra_alc5632.c index 6dcd06a966c7..ba272e21a6fa 100644 --- a/sound/soc/tegra/tegra_alc5632.c +++ b/sound/soc/tegra/tegra_alc5632.c @@ -101,9 +101,6 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = { static int tegra_alc5632_asoc_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; struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card); snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, @@ -118,7 +115,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd) &tegra_alc5632_hp_jack_gpio); } - snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1"); + snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1"); return 0; } |