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

diff --git a/sound/soc/codecs/mt6358.c b/sound/soc/codecs/mt6358.c
index de611c483e0bea69797a3994926dc6f4161d4602..a787accb88e851fb31ac1e85887d1dcb0378dc6f 100644 (file)
--- a/sound/soc/codecs/mt6358.c
+++ b/sound/soc/codecs/mt6358.c
@@ -1287,7 +1287,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 mt6358_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_info(priv->dev, "%s(), event 0x%x, dev_counter[DEV_HP] %d, mux %u\n",
@@ -1349,7 +1349,7 @@ static int mt_rcv_event(struct snd_soc_dapm_widget *w,
        dev_info(priv->dev, "%s(), event 0x%x, mux %u\n",
                 __func__,
                 event,
-                dapm_kcontrol_get_value(w->kcontrols[0]));
+                snd_soc_dapm_kcontrol_get_value(w->kcontrols[0]));
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
@@ -1828,7 +1828,7 @@ static int mt_mic_type_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6358_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);
@@ -1874,7 +1874,7 @@ static int mt_adc_l_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6358_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);
@@ -1890,7 +1890,7 @@ static int mt_adc_r_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6358_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);
@@ -1906,7 +1906,7 @@ static int mt_pga_left_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6358_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);
@@ -1922,7 +1922,7 @@ static int mt_pga_right_event(struct snd_soc_dapm_widget *w,
 {
        struct snd_soc_component *cmpnt = snd_soc_dapm_to_component(w->dapm);
        struct mt6358_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);