Commit 0a2cfcd9 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: don't use codec_dais on soc_bind_dai_link()

Current soc_bind_dai_link() is substituting rtd->codec_dais to
codec_dais, and sets found DAI into it.
But, it is a little bit un-readable / un-understandable to
know detail of rtd, and it will make difficult to understand
rtd->cpu_dais if Multi CPU was supported.
This patch cleanup it and prepare for Multi CPU support.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 22d251a5
...@@ -878,7 +878,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card, ...@@ -878,7 +878,6 @@ static int soc_bind_dai_link(struct snd_soc_card *card,
struct snd_soc_dai_link_component *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;
int i; int i;
if (dai_link->ignore) if (dai_link->ignore)
...@@ -910,19 +909,18 @@ static int soc_bind_dai_link(struct snd_soc_card *card, ...@@ -910,19 +909,18 @@ 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 */
codec_dais = rtd->codec_dais;
for_each_link_codecs(dai_link, i, codecs) { for_each_link_codecs(dai_link, i, codecs) {
codec_dais[i] = snd_soc_find_dai(codecs); rtd->codec_dais[i] = snd_soc_find_dai(codecs);
if (!codec_dais[i]) { if (!rtd->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->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, rtd->codec_dais[i]->component);
} }
/* Single codec links expect codec and codec_dai in runtime data */ /* Single codec links expect codec and codec_dai in runtime data */
rtd->codec_dai = codec_dais[0]; rtd->codec_dai = rtd->codec_dais[0];
/* find one from the set of registered platforms */ /* find one from the set of registered platforms */
for_each_component(component) { for_each_component(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