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

ASoC: mediatek: mtk-dsp-sof-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/878qgdwgpz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Kuninori Morimoto and committed by
Mark Brown
b63f223c 063e91a9

+3 -2
+3 -2
sound/soc/mediatek/common/mtk-dsp-sof-common.c
··· 139 139 140 140 int mtk_sof_card_late_probe(struct snd_soc_card *card) 141 141 { 142 + struct snd_soc_dapm_context *dapm = snd_soc_card_to_dapm(card); 142 143 struct snd_soc_pcm_runtime *rtd; 143 144 struct snd_soc_component *sof_comp = NULL; 144 145 struct mtk_soc_card_data *soc_card_data = ··· 205 204 snd_soc_dapm_widget_for_each_sink_path(widget, p) { 206 205 route.source = conn->sof_dma; 207 206 route.sink = p->sink->name; 208 - snd_soc_dapm_add_routes(&card->dapm, &route, 1); 207 + snd_soc_dapm_add_routes(dapm, &route, 1); 209 208 } 210 209 } else if (conn->stream_dir == SNDRV_PCM_STREAM_PLAYBACK && widget) { 211 210 snd_soc_dapm_widget_for_each_source_path(widget, p) { 212 211 route.source = p->source->name; 213 212 route.sink = conn->sof_dma; 214 - snd_soc_dapm_add_routes(&card->dapm, &route, 1); 213 + snd_soc_dapm_add_routes(dapm, &route, 1); 215 214 } 216 215 } else { 217 216 dev_err(cpu_dai->dev, "stream dir and widget not pair\n");