summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2020-03-16 15:37:09 +0900
committerMark Brown <broonie@kernel.org>2020-03-20 20:45:34 +0000
commite3c3cf71013fd959abf455abc20386051d37c529 (patch)
tree52c1ba695e9756b53b709669cccb6541add0fe58 /sound/soc
parent3af6ff5035ad95ee02728aff271a9b543b912f15 (diff)
downloadlinux-e3c3cf71013fd959abf455abc20386051d37c529.tar.bz2
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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/soc-dapm.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index d5eb52fe115b..04da7928c873 100644
--- 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);
}