diff options
| author | Kuninori Morimoto | 2019-05-13 09:06:30 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-05-13 13:44:02 +0200 |
| commit | 0a2cfcd998e3503c20be497cadb0ef23edb984be (patch) | |
| tree | 69192935258915c2dbb55e7ae092220491b446a6 /sound/soc/soc-core.c | |
| parent | ASoC: soc-core: use i on snd_soc_resume() (diff) | |
| download | kernel-qcow2-linux-0a2cfcd998e3503c20be497cadb0ef23edb984be.tar.gz kernel-qcow2-linux-0a2cfcd998e3503c20be497cadb0ef23edb984be.tar.xz kernel-qcow2-linux-0a2cfcd998e3503c20be497cadb0ef23edb984be.zip | |
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: 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.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0d9b02075050..2ceca7fdf622 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -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 cpu_dai_component; struct snd_soc_component *component; - struct snd_soc_dai **codec_dais; int i; if (dai_link->ignore) @@ -910,19 +909,18 @@ static int soc_bind_dai_link(struct snd_soc_card *card, rtd->num_codecs = dai_link->num_codecs; /* Find CODEC from registered CODECs */ - codec_dais = rtd->codec_dais; for_each_link_codecs(dai_link, i, codecs) { - codec_dais[i] = snd_soc_find_dai(codecs); - if (!codec_dais[i]) { + rtd->codec_dais[i] = snd_soc_find_dai(codecs); + if (!rtd->codec_dais[i]) { dev_info(card->dev, "ASoC: CODEC DAI %s not registered\n", codecs->dai_name); 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 */ - rtd->codec_dai = codec_dais[0]; + rtd->codec_dai = rtd->codec_dais[0]; /* find one from the set of registered platforms */ for_each_component(component) { |