UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: soc-core: 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/87v9n4olf4.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2020-03-16 15:37:03 +09:00 committed by Mark Brown
parent 22a2fc8165
commit 3af6ff5035
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/soc/soc-core.c
View File

@ -1323,26 +1323,22 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order)
static void soc_remove_link_dais(struct snd_soc_card *card) static void soc_remove_link_dais(struct snd_soc_card *card)
{ {
int i; int i;
struct snd_soc_dai *codec_dai; struct snd_soc_dai *dai;
struct snd_soc_dai *cpu_dai;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
int order; int order;
for_each_comp_order(order) { for_each_comp_order(order) {
for_each_card_rtds(card, rtd) { for_each_card_rtds(card, rtd) {
/* remove the CODEC DAI */ /* remove DAIs */
for_each_rtd_codec_dais(rtd, i, codec_dai) for_each_rtd_dais(rtd, i, dai)
soc_remove_dai(codec_dai, order); soc_remove_dai(dai, order);
for_each_rtd_cpu_dais(rtd, i, cpu_dai)
soc_remove_dai(cpu_dai, order);
} }
} }
} }
static int soc_probe_link_dais(struct snd_soc_card *card) static int soc_probe_link_dais(struct snd_soc_card *card)
{ {
struct snd_soc_dai *codec_dai, *cpu_dai; struct snd_soc_dai *dai;
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
int i, order, ret; int i, order, ret;
@ -1354,15 +1350,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card)
card->name, rtd->num, order); card->name, rtd->num, order);
/* probe the CPU DAI */ /* probe the CPU DAI */
for_each_rtd_cpu_dais(rtd, i, cpu_dai) { for_each_rtd_dais(rtd, i, dai) {
ret = soc_probe_dai(cpu_dai, order); ret = soc_probe_dai(dai, order);
if (ret)
return ret;
}
/* probe the CODEC DAI */
for_each_rtd_codec_dais(rtd, i, codec_dai) {
ret = soc_probe_dai(codec_dai, order);
if (ret) if (ret)
return ret; return ret;
} }