summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
authorKuninori Morimoto2019-01-21 01:32:59 +0100
committerMark Brown2019-01-21 19:14:02 +0100
commit10dff9b0ddf70bebe9523fc311ec77a872ce0a9c (patch)
treefb5fd4d1eab30ff35ea404c6dcb907d1a244454e /sound/soc/soc-core.c
parentASoC: soc-core: add soc_cleanup_component() (diff)
downloadkernel-qcow2-linux-10dff9b0ddf70bebe9523fc311ec77a872ce0a9c.tar.gz
kernel-qcow2-linux-10dff9b0ddf70bebe9523fc311ec77a872ce0a9c.tar.xz
kernel-qcow2-linux-10dff9b0ddf70bebe9523fc311ec77a872ce0a9c.zip
ASoC: soc-core: use for_each_link_codecs() for dai_link codecs
We can use for_each_link_codecs() without waiting for_each_rtd_codec_dai() on soc_bind_dai_link(). Let's use for_each macro Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 8a58fa86675a..1c92b4aff57b 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -870,7 +870,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link)
{
struct snd_soc_pcm_runtime *rtd;
- struct snd_soc_dai_link_component *codecs = dai_link->codecs;
+ struct snd_soc_dai_link_component *codecs;
struct snd_soc_dai_link_component cpu_dai_component;
struct snd_soc_component *component;
struct snd_soc_dai **codec_dais;
@@ -905,9 +905,8 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
rtd->num_codecs = dai_link->num_codecs;
/* Find CODEC from registered CODECs */
- /* we can use for_each_rtd_codec_dai() after this */
codec_dais = rtd->codec_dais;
- for (i = 0; i < rtd->num_codecs; i++) {
+ for_each_link_codecs(dai_link, i, codecs) {
codec_dais[i] = snd_soc_find_dai(&codecs[i]);
if (!codec_dais[i]) {
dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",