leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: soc-core: self contained soc_probe_link_dais()

Browse Source 
Current soc_probe_link_dais() implementation is very half,
thus it is very difficult to read.

	for_each_comp_order(xxx) {
		for_each_card_rtds(xxx)
=>			soc_probe_link_dais(xxx);
	}

This patch does all for_each_xxx() under soc_probe_link_dais(),
and makes it to self contained.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87woeoor1m.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2019-09-04 09:15:17 +09:00 committed by Mark Brown
parent c4b4698291
commit c7e73774f2
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1452,25 +1452,30 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
return 0; return 0;
} }
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_pcm_runtime *rtd, int order)
{ {
struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
struct snd_soc_dai *codec_dai; struct snd_soc_dai *codec_dai;
int i, ret; struct snd_soc_pcm_runtime *rtd;
int i, order, ret;
dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n", for_each_comp_order(order) {
card->name, rtd->num, order); for_each_card_rtds(card, rtd) {
ret = soc_probe_dai(cpu_dai, order); dev_dbg(card->dev,
if (ret) "ASoC: probe %s dai link %d late %d\n",
return ret; card->name, rtd->num, order);
/* probe the CODEC DAI */ ret = soc_probe_dai(rtd->cpu_dai, order);
for_each_rtd_codec_dai(rtd, i, codec_dai) { if (ret)
ret = soc_probe_dai(codec_dai, order); return ret;
if (ret)
return ret; /* probe the CODEC DAI */
for_each_rtd_codec_dai(rtd, i, codec_dai) {
ret = soc_probe_dai(codec_dai, order);
if (ret)
return ret;
}
}
} }
return 0; return 0;
@ -1933,7 +1938,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_dai_link *dai_link; struct snd_soc_dai_link *dai_link;
struct snd_soc_aux_dev *aux; struct snd_soc_aux_dev *aux;
int ret, i, order; int ret, i;
mutex_lock(&client_mutex); mutex_lock(&client_mutex);
for_each_card_prelinks(card, i, dai_link) { for_each_card_prelinks(card, i, dai_link) {
@ -2034,16 +2039,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
} }
/* probe all DAI links on this card */ /* probe all DAI links on this card */
for_each_comp_order(order) { ret = soc_probe_link_dais(card);
for_each_card_rtds(card, rtd) { if (ret < 0) {
ret = soc_probe_link_dais(card, rtd, order); dev_err(card->dev,
if (ret < 0) { "ASoC: failed to instantiate card %d\n", ret);
dev_err(card->dev, goto probe_end;
"ASoC: failed to instantiate card %d\n",
ret);
goto probe_end;
}
}
} }
for_each_card_rtds(card, rtd) for_each_card_rtds(card, rtd)