Commit 720734a0 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: use for_each_link_codecs() for dai_link codecs V2

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.

Fixes: 50acc7e49 ("ASoC: core: Fix multi-CODEC setups")
Fixes: 10dff9b0 ("ASoC: soc-core: use for_each_link_codecs() for dai_link codecs")
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 141474c6
...@@ -870,7 +870,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, ...@@ -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_dai_link *dai_link)
{ {
struct snd_soc_pcm_runtime *rtd; 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_dai_link_component cpu_dai_component;
struct snd_soc_component *component; struct snd_soc_component *component;
struct snd_soc_dai **codec_dais; struct snd_soc_dai **codec_dais;
...@@ -905,13 +905,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card, ...@@ -905,13 +905,12 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
rtd->num_codecs = dai_link->num_codecs; rtd->num_codecs = dai_link->num_codecs;
/* Find CODEC from registered CODECs */ /* Find CODEC from registered CODECs */
/* we can use for_each_rtd_codec_dai() after this */
codec_dais = rtd->codec_dais; 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]); codec_dais[i] = snd_soc_find_dai(codecs);
if (!codec_dais[i]) { if (!codec_dais[i]) {
dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n", dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n",
codecs[i].dai_name); codecs->dai_name);
goto _err_defer; goto _err_defer;
} }
snd_soc_rtdcom_add(rtd, codec_dais[i]->component); snd_soc_rtdcom_add(rtd, codec_dais[i]->component);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment