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

diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c
index 13b790f81d4421b7dbe57857f21d1a66d4591a79..76146f91cddcc2205adc4acd2000eac85f0e8f13 100644 (file)
--- a/drivers/staging/greybus/audio_topology.c
+++ b/drivers/staging/greybus/audio_topology.c
@@ -380,7 +380,7 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,
        struct gbaudio_module_info *module;
        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
-       struct device *codec_dev = widget->dapm->dev;
+       struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
        struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
        struct gb_bundle *bundle;
 
@@ -393,7 +393,7 @@ static int gbcodec_mixer_dapm_ctl_get(struct snd_kcontrol *kcontrol,
        bundle = to_gb_bundle(module->dev);
 
        if (data->vcount == 2)
-               dev_warn(widget->dapm->dev,
+               dev_warn(codec_dev,
                         "GB: Control '%s' is stereo, which is not supported\n",
                         kcontrol->id.name);
 
@@ -429,7 +429,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,
        struct gbaudio_module_info *module;
        struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol);
        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
-       struct device *codec_dev = widget->dapm->dev;
+       struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
        struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
        struct gb_bundle *bundle;
 
@@ -443,7 +443,7 @@ static int gbcodec_mixer_dapm_ctl_put(struct snd_kcontrol *kcontrol,
        bundle = to_gb_bundle(module->dev);
 
        if (data->vcount == 2)
-               dev_warn(widget->dapm->dev,
+               dev_warn(codec_dev,
                         "GB: Control '%s' is stereo, which is not supported\n",
                         kcontrol->id.name);
 
@@ -712,7 +712,7 @@ static int gbcodec_enum_dapm_ctl_get(struct snd_kcontrol *kcontrol,
        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
        struct gbaudio_module_info *module;
        struct gb_audio_ctl_elem_value gbvalue;
-       struct device *codec_dev = widget->dapm->dev;
+       struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
        struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct gb_bundle *bundle;
@@ -759,7 +759,7 @@ static int gbcodec_enum_dapm_ctl_put(struct snd_kcontrol *kcontrol,
        struct snd_soc_dapm_widget *widget = wlist->widgets[0];
        struct gb_audio_ctl_elem_value gbvalue;
        struct gbaudio_module_info *module;
-       struct device *codec_dev = widget->dapm->dev;
+       struct device *codec_dev = snd_soc_dapm_to_dev(widget->dapm);
        struct gbaudio_codec_info *gb = dev_get_drvdata(codec_dev);
        struct soc_enum *e = (struct soc_enum *)kcontrol->private_value;
        struct gb_bundle *bundle;
@@ -924,7 +924,7 @@ static int gbaudio_widget_event(struct snd_soc_dapm_widget *w,
 {
        int wid;
        int ret;
-       struct device *codec_dev = w->dapm->dev;
+       struct device *codec_dev = snd_soc_dapm_to_dev(w->dapm);
        struct gbaudio_codec_info *gbcodec = dev_get_drvdata(codec_dev);
        struct gbaudio_module_info *module;
        struct gb_bundle *bundle;