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

diff --git a/sound/soc/codecs/sma1307.c b/sound/soc/codecs/sma1307.c
index 5ac033e0ba808a9bae25172d2dffb95bceda8238..4bb59e5c089153f888d4b800cd3454fe3d9f92f7 100644 (file)
--- a/sound/soc/codecs/sma1307.c
+++ b/sound/soc/codecs/sma1307.c
@@ -790,10 +790,9 @@ static int sma1307_power_event(struct snd_soc_dapm_widget *w,
 static int sma1307_dapm_aif_in_get(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
 
        ucontrol->value.enumerated.item[0] = (unsigned int)sma1307->dapm_aif_in;
        snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
@@ -804,10 +803,9 @@ static int sma1307_dapm_aif_in_get(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_aif_in_put(struct snd_kcontrol *kcontrol,
                                   struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
        int val = (int)ucontrol->value.enumerated.item[0];
        bool change;
 
@@ -830,10 +828,9 @@ static int sma1307_dapm_aif_in_put(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_sdo_setting_get(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
 
        ucontrol->value.enumerated.item[0] =
            (unsigned int)sma1307->dapm_sdo_setting;
@@ -845,10 +842,9 @@ static int sma1307_dapm_sdo_setting_get(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_sdo_setting_put(struct snd_kcontrol *kcontrol,
                                        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
        int val = (int)ucontrol->value.enumerated.item[0];
        bool change;
 
@@ -871,10 +867,9 @@ static int sma1307_dapm_sdo_setting_put(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_aif_out_get(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
        unsigned int val = 0;
 
        if (!strcmp(kcontrol->id.name, SMA1307_AIF_OUT0_NAME)) {
@@ -895,10 +890,9 @@ static int sma1307_dapm_aif_out_get(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_aif_out_put(struct snd_kcontrol *kcontrol,
                                    struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
        int val = (int)ucontrol->value.enumerated.item[0];
        bool change;
 
@@ -933,10 +927,9 @@ static int sma1307_dapm_aif_out_put(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_sdo_enable_get(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
 
        ucontrol->value.integer.value[0] = (long)sma1307->dapm_sdo_en;
        snd_soc_dapm_put_volsw(kcontrol, ucontrol);
@@ -947,10 +940,9 @@ static int sma1307_dapm_sdo_enable_get(struct snd_kcontrol *kcontrol,
 static int sma1307_dapm_sdo_enable_put(struct snd_kcontrol *kcontrol,
                                       struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_dapm_kcontrol_dapm(kcontrol);
-       struct sma1307_priv *sma1307 =
-           snd_soc_component_get_drvdata(dapm->component);
+       struct snd_soc_dapm_context *dapm = snd_soc_dapm_kcontrol_to_dapm(kcontrol);
+       struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
+       struct sma1307_priv *sma1307 = snd_soc_component_get_drvdata(component);
        int val = (int)ucontrol->value.integer.value[0];
        bool change;
 
@@ -1857,8 +1849,7 @@ static void sma1307_set_default(struct snd_soc_component *component)
 
 static int sma1307_probe(struct snd_soc_component *component)
 {
-       struct snd_soc_dapm_context *dapm =
-           snd_soc_component_get_dapm(component);
+       struct snd_soc_dapm_context *dapm = snd_soc_component_to_dapm(component);
 
        snd_soc_dapm_sync(dapm);