ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais()

Now we can use for_each_rtd_dais().
Let's use it instead of for_each_rtd_cpu/codec_dais().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/87tv2ooley.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d5eb52fe115b4f72d81d9647d8e00c67d95a89ee..04da7928c873d8a0537396c75e6e11b0cfbc959a 100644 (file)
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -4433,14 +4433,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card)
 static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
        int event)
 {
-       struct snd_soc_dai *codec_dai;
-       struct snd_soc_dai *cpu_dai;
+       struct snd_soc_dai *dai;
        int i;
 
-       for_each_rtd_cpu_dais(rtd, i, cpu_dai)
-               soc_dapm_dai_stream_event(cpu_dai, stream, event);
-       for_each_rtd_codec_dais(rtd, i, codec_dai)
-               soc_dapm_dai_stream_event(codec_dai, stream, event);
+       for_each_rtd_dais(rtd, i, dai)
+               soc_dapm_dai_stream_event(dai, stream, event);
 
        dapm_power_widgets(rtd->card, event);
 }