ASoC: tegra_alc5632: Use card DAPM context to access widgets
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 3 Apr 2015 11:04:05 +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_alc5632.c

index 6dcd06a966c7c6149b8020f806e3bbb9c09af976..ba272e21a6fa3112e09f407e1b5747e985cca747 100644 (file)
@@ -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;
 }