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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/874l1sq5mx.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 05a2aff843aaf12ace444b8649a33a665d5dfd71..04b98e6c7b2ae1869f182780cff2e3d5168f0274 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -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,
-                                    struct snd_soc_pcm_runtime *rtd, int order)
+static int soc_probe_link_components(struct snd_soc_card *card)
 {
        struct snd_soc_component *component;
+       struct snd_soc_pcm_runtime *rtd;
        struct snd_soc_rtdcom_list *rtdcom;
-       int ret;
+       int ret, order;
 
-       for_each_rtdcom(rtd, rtdcom) {
-               component = rtdcom->component;
+       for_each_comp_order(order) {
+               for_each_card_rtds(card, rtd) {
+                       for_each_rtdcom(rtd, rtdcom) {
+                               component = rtdcom->component;
 
-               if (component->driver->probe_order == order) {
-                       ret = soc_probe_component(card, component);
-                       if (ret < 0)
-                               return ret;
+                               if (component->driver->probe_order != order)
+                                       continue;
+
+                               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)
        }
 
        /* probe all components used by DAI links on this card */
-       for_each_comp_order(order) {
-               for_each_card_rtds(card, rtd) {
-                       ret = soc_probe_link_components(card, rtd, order);
-                       if (ret < 0) {
-                               dev_err(card->dev,
-                                       "ASoC: failed to instantiate card %d\n",
-                                       ret);
-                               goto probe_end;
-                       }
-               }
+       ret = soc_probe_link_components(card);
+       if (ret < 0) {
+               dev_err(card->dev,
+                       "ASoC: failed to instantiate card %d\n", ret);
+               goto probe_end;
        }
 
        /* probe auxiliary components */