Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Kuninori Morimoto and committed by
Mark Brown
2bcf4235 d10755f8

+6 -5
+6 -5
sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c
··· 93 93 int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) 94 94 { 95 95 struct snd_soc_card *card = rtd->card; 96 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 96 97 struct asoc_sdw_mc_private *ctx = snd_soc_card_get_drvdata(card); 97 98 struct snd_soc_component *component; 98 99 struct snd_soc_jack *jack; ··· 119 118 } 120 119 121 120 if (strstr(component->name_prefix, "rt711")) { 122 - ret = snd_soc_dapm_add_routes(&card->dapm, rt711_sdca_map, 121 + ret = snd_soc_dapm_add_routes(dapm, rt711_sdca_map, 123 122 ARRAY_SIZE(rt711_sdca_map)); 124 123 } else if (strstr(component->name_prefix, "rt712")) { 125 - ret = snd_soc_dapm_add_routes(&card->dapm, rt712_sdca_map, 124 + ret = snd_soc_dapm_add_routes(dapm, rt712_sdca_map, 126 125 ARRAY_SIZE(rt712_sdca_map)); 127 126 } else if (strstr(component->name_prefix, "rt713")) { 128 - ret = snd_soc_dapm_add_routes(&card->dapm, rt713_sdca_map, 127 + ret = snd_soc_dapm_add_routes(dapm, rt713_sdca_map, 129 128 ARRAY_SIZE(rt713_sdca_map)); 130 129 } else if (strstr(component->name_prefix, "rt721")) { 131 - ret = snd_soc_dapm_add_routes(&card->dapm, rt721_sdca_map, 130 + ret = snd_soc_dapm_add_routes(dapm, rt721_sdca_map, 132 131 ARRAY_SIZE(rt721_sdca_map)); 133 132 } else if (strstr(component->name_prefix, "rt722")) { 134 - ret = snd_soc_dapm_add_routes(&card->dapm, rt722_sdca_map, 133 + ret = snd_soc_dapm_add_routes(dapm, rt722_sdca_map, 135 134 ARRAY_SIZE(rt722_sdca_map)); 136 135 } else { 137 136 dev_err(card->dev, "%s is not supported\n", component->name_prefix);