ASoC: codecs: mt6359: 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/87pl9p4dsz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/mt6359.c b/sound/soc/codecs/mt6359.c
index be5c97390398665ffb41595a1101b8949acc286e..b15bdb15dbb0795c1349c600273d122233daf855 100644 (file)
--- a/sound/soc/codecs/mt6359.c
+++ b/sound/soc/codecs/mt6359.c
@@ -1043,7 +1043,7 @@ static int mt_hp_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-       unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+       unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
        int device = DEVICE_HP;
 
        dev_dbg(priv->dev, "%s(), event 0x%x, dev_counter[DEV_HP] %d, mux %u\n",
@@ -1075,7 +1075,7 @@ static int mt_rcv_event(struct snd_soc_dapm_widget *w,
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
 
        dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",
-               __func__, event, dapm_kcontrol_get_value(w->kcontrols[0]));
+               __func__, event, snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]));
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
@@ -1157,7 +1157,7 @@ static int mt_lo_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-       unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+       unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 
        dev_dbg(priv->dev, "%s(), event 0x%x, mux %u\n",
                __func__, event, mux);
@@ -1637,7 +1637,7 @@ static int mt_pga_l_mux_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-       unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+       unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 
        dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
        priv->mux_select[MUX_PGA_L] = mux >> RG_AUDPREAMPLINPUTSEL_SFT;
@@ -1650,7 +1650,7 @@ static int mt_pga_r_mux_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-       unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+       unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 
        dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
        priv->mux_select[MUX_PGA_R] = mux >> RG_AUDPREAMPRINPUTSEL_SFT;
@@ -1663,7 +1663,7 @@ static int mt_pga_3_mux_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6359_priv *priv = snd_soc_component_get_drvdata(cmpnt);
-       unsigned int mux = dapm_kcontrol_get_value(w->kcontrols[0]);
+       unsigned int mux = snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]);
 
        dev_dbg(priv->dev, "%s(), mux %d\n", __func__, mux);
        priv->mux_select[MUX_PGA_3] = mux >> RG_AUDPREAMP3INPUTSEL_SFT;