ASoC: tegra: tegra_asoc_machine: convert to snd_soc_dapm_xxx()

This patch converts below functions.

dapm->dev					-> snd_soc_dapm_to_dev()
dapm->card					-> snd_soc_dapm_to_card()
dapm->component					-> snd_soc_dapm_to_component()

dapm_kcontrol_get_value()			-> snd_soc_dapm_kcontrol_get_value()

snd_soc_component_enable_pin()			-> snd_soc_dapm_enable_pin()
snd_soc_component_enable_pin_unlocked()		-> snd_soc_dapm_enable_pin_unlocked()
snd_soc_component_disable_pin()			-> snd_soc_dapm_disable_pin()
snd_soc_component_disable_pin_unlocked()	-> snd_soc_dapm_disable_pin_unlocked()
snd_soc_component_nc_pin()			-> snd_soc_dapm_nc_pin()
snd_soc_component_nc_pin_unlocked()		-> snd_soc_dapm_nc_pin_unlocked()
snd_soc_component_get_pin_status()		-> snd_soc_dapm_get_pin_status()
snd_soc_component_force_enable_pin()		-> snd_soc_dapm_force_enable_pin()
snd_soc_component_force_enable_pin_unlocked()	-> snd_soc_dapm_force_enable_pin_unlocked()
snd_soc_component_force_bias_level()		-> snd_soc_dapm_force_bias_level()
snd_soc_component_get_bias_level()		-> snd_soc_dapm_get_bias_level()
snd_soc_component_init_bias_level()		-> snd_soc_dapm_init_bias_level()
snd_soc_component_get_dapm()			-> snd_soc_component_to_dapm()

snd_soc_dapm_kcontrol_component()		-> snd_soc_dapm_kcontrol_to_component()
snd_soc_dapm_kcontrol_widget()			-> snd_soc_dapm_kcontrol_to_widget()
snd_soc_dapm_kcontrol_dapm()			-> snd_soc_dapm_kcontrol_to_dapm()
snd_soc_dapm_np_pin()				-> snd_soc_dapm_disable_pin()

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/871pm5tnfg.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index 62f89677273193e608ca93dbbbed21621322498b..d48463ac16fc2ae85094a8509c5fe01db59535a7 100644 (file)
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -78,8 +78,8 @@ static struct snd_soc_jack_gpio tegra_machine_mic_jack_gpio = {
 static int tegra_machine_event(struct snd_soc_dapm_widget *w,
                               struct snd_kcontrol *k, int event)
 {
-       struct snd_soc_dapm_context *dapm = w->dapm;
-       struct tegra_machine *machine = snd_soc_card_get_drvdata(dapm->card);
+       struct snd_soc_card *card = snd_soc_dapm_to_card(w->dapm);
+       struct tegra_machine *machine = snd_soc_card_get_drvdata(card);
 
        if (!snd_soc_dapm_widget_name_cmp(w, "Int Spk") ||
            !snd_soc_dapm_widget_name_cmp(w, "Speakers"))
@@ -659,7 +659,9 @@ static const struct tegra_asoc_data tegra_wm8753_data = {
 
 static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
 {
-       return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(rtd->card);
+
+       return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
 }
 
 SND_SOC_DAILINK_DEFS(wm9712_hifi,
@@ -839,13 +841,14 @@ static const struct tegra_asoc_data tegra_trimslice_data = {
 static int tegra_rt5677_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
        int err;
 
        err = tegra_asoc_machine_init(rtd);
        if (err)
                return err;
 
-       snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS1");
+       snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
 
        return 0;
 }