Unverified Commit 36570f32 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dapm: convert not to use asoc_xxx() 



ASoC is now unified asoc_xxx() into snd_soc_xxx().
This patch convert asoc_xxx() to snd_soc_xxx().

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ledcp8tk.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent eeec74aa

sound/soc/soc-dapm.c

+6 −6
Original line number Diff line number Diff line
@@ -2717,7 +2717,7 @@ int snd_soc_dapm_update_dai(struct snd_pcm_substream *substream, 
			    struct snd_pcm_hw_params *params,

			    struct snd_soc_dai *dai)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	int ret;



	snd_soc_dapm_mutex_lock(rtd->card);
@@ -3822,7 +3822,7 @@ snd_soc_dai_link_event_pre_pmu(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_dapm_path *path;

	struct snd_soc_dai *source, *sink;

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_pcm_hw_params *params = NULL;

	const struct snd_soc_pcm_stream *config = NULL;

	struct snd_pcm_runtime *runtime = NULL;
@@ -4142,7 +4142,7 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, 
		     struct snd_pcm_substream *substream,

		     char *id)

{

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);

	struct snd_soc_dapm_widget template;

	struct snd_soc_dapm_widget *w;

	const struct snd_kcontrol_new *kcontrol_news;
@@ -4441,11 +4441,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
		if (rtd->dai_link->num_cpus == 1) {

			for_each_rtd_codec_dais(rtd, i, codec_dai)

				dapm_connect_dai_pair(card, rtd, codec_dai,

						      asoc_rtd_to_cpu(rtd, 0));

						      snd_soc_rtd_to_cpu(rtd, 0));

		} else if (rtd->dai_link->num_codecs == rtd->dai_link->num_cpus) {

			for_each_rtd_codec_dais(rtd, i, codec_dai)

				dapm_connect_dai_pair(card, rtd, codec_dai,

						      asoc_rtd_to_cpu(rtd, i));

						      snd_soc_rtd_to_cpu(rtd, i));

		} else if (rtd->dai_link->num_codecs > rtd->dai_link->num_cpus) {

			int cpu_id;
@@ -4465,7 +4465,7 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) 
					continue;

				}

				dapm_connect_dai_pair(card, rtd, codec_dai,

						      asoc_rtd_to_cpu(rtd, cpu_id));

						      snd_soc_rtd_to_cpu(rtd, cpu_id));

			}

		} else {

			dev_err(card->dev,