Commit 62f07a6b authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: self contained soc_probe_link_components()

Current soc_probe_link_components() implementation is very half,
thus it is very difficult to read.

	for_each_comp_order(xxx) {
		for_each_card_rtds(xxx) {
=>			ret = soc_probe_link_components(xxx);
			...
		}
	}

This patch does all for_each_xxx() under soc_probe_link_components(),
and makes it to self contained.
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l1sq5mx.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 13ab0d1a
...@@ -1137,20 +1137,25 @@ static void soc_remove_link_components(struct snd_soc_card *card, ...@@ -1137,20 +1137,25 @@ static void soc_remove_link_components(struct snd_soc_card *card,
} }
} }
static int soc_probe_link_components(struct snd_soc_card *card, static int soc_probe_link_components(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd, int order)
{ {
struct snd_soc_component *component; struct snd_soc_component *component;
struct snd_soc_pcm_runtime *rtd;
struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_rtdcom_list *rtdcom;
int ret; int ret, order;
for_each_rtdcom(rtd, rtdcom) { for_each_comp_order(order) {
component = rtdcom->component; for_each_card_rtds(card, rtd) {
for_each_rtdcom(rtd, rtdcom) {
component = rtdcom->component;
if (component->driver->probe_order == order) { if (component->driver->probe_order != order)
ret = soc_probe_component(card, component); continue;
if (ret < 0)
return ret; ret = soc_probe_component(card, component);
if (ret < 0)
return ret;
}
} }
} }
...@@ -1990,16 +1995,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ...@@ -1990,16 +1995,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
} }
/* probe all components used by DAI links on this card */ /* probe all components used by DAI links on this card */
for_each_comp_order(order) { ret = soc_probe_link_components(card);
for_each_card_rtds(card, rtd) { if (ret < 0) {
ret = soc_probe_link_components(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;
}
}
} }
/* probe auxiliary components */ /* probe auxiliary components */
......
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