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

ASoC: soc-core: self contained soc_probe_link_dais() 



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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87woeoor1m.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-core.c

+25 −25
Original line number Diff line number Diff line
@@ -1452,17 +1452,20 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais, 
	return 0;

}



static int soc_probe_link_dais(struct snd_soc_card *card,

		struct snd_soc_pcm_runtime *rtd, int order)

static int soc_probe_link_dais(struct snd_soc_card *card)

{

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_dai *codec_dai;

	int i, ret;

	struct snd_soc_pcm_runtime *rtd;

	int i, order, ret;



	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd) {



	dev_dbg(card->dev, "ASoC: probe %s dai link %d late %d\n",

			dev_dbg(card->dev,

				"ASoC: probe %s dai link %d late %d\n",

				card->name, rtd->num, order);



	ret = soc_probe_dai(cpu_dai, order);

			ret = soc_probe_dai(rtd->cpu_dai, order);

			if (ret)

				return ret;
@@ -1472,6 +1475,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card, 
				if (ret)

					return ret;

			}

		}

	}



	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_dai_link *dai_link;

	struct snd_soc_aux_dev *aux;

	int ret, i, order;

	int ret, i;



	mutex_lock(&client_mutex);

	for_each_card_prelinks(card, i, dai_link) {
@@ -2034,17 +2039,12 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
	}



	/* probe all DAI links on this card */

	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd) {

			ret = soc_probe_link_dais(card, rtd, order);

	ret = soc_probe_link_dais(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;

	}

		}

	}



	for_each_card_rtds(card, rtd)

		soc_link_init(card, rtd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE