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

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.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 13ab0d1a

sound/soc/soc-core.c

+19 −19
Original line number Diff line number Diff line
@@ -1137,22 +1137,27 @@ 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_comp_order(order) {

		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)

					continue;



				ret = soc_probe_component(card, component);

				if (ret < 0)

					return ret;

			}

		}

	}



	return 0;

}
@@ -1990,17 +1995,12 @@ 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);

	ret = soc_probe_link_components(card);

	if (ret < 0) {

		dev_err(card->dev,

					"ASoC: failed to instantiate card %d\n",

					ret);

			"ASoC: failed to instantiate card %d\n", ret);

		goto probe_end;

	}

		}

	}



	/* probe auxiliary components */

	ret = soc_probe_aux_devices(card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE