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

diff --git a/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c b/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
index 6279faf6edd48880615d80dbba850c4fcea08008..2547b5b3fdd7959a8a354cdfe3d998a14cf4dc96 100644 (file)
--- a/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
+++ b/sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
@@ -93,6 +93,7 @@ static const char * const need_sdca_suffix[] = {
 int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
 {
        struct snd_soc_card *card = rtd->card;
+       struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card);
        struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card);
        struct snd_soc_component *component;
        struct snd_soc_jack *jack;
@@ -118,19 +119,19 @@ int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_s
        }
 
        if (strstr(component->name_prefix, "rt711")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt711_sdca_map,
+               ret = snd_soc_dapm_add_routes(dapm, rt711_sdca_map,
                                              ARRAY_SIZE(rt711_sdca_map));
        } else if (strstr(component->name_prefix, "rt712")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt712_sdca_map,
+               ret = snd_soc_dapm_add_routes(dapm, rt712_sdca_map,
                                              ARRAY_SIZE(rt712_sdca_map));
        } else if (strstr(component->name_prefix, "rt713")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map,
+               ret = snd_soc_dapm_add_routes(dapm, rt713_sdca_map,
                                              ARRAY_SIZE(rt713_sdca_map));
        } else if (strstr(component->name_prefix, "rt721")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt721_sdca_map,
+               ret = snd_soc_dapm_add_routes(dapm, rt721_sdca_map,
                                              ARRAY_SIZE(rt721_sdca_map));
        } else if (strstr(component->name_prefix, "rt722")) {
-               ret = snd_soc_dapm_add_routes(&card->dapm, rt722_sdca_map,
+               ret = snd_soc_dapm_add_routes(dapm, rt722_sdca_map,
                                              ARRAY_SIZE(rt722_sdca_map));
        } else {
                dev_err(card->dev, "%s is not supported\n", component->name_prefix);