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

ASoC: soc-core: add new soc_link_init() 



Current soc_probe_link_dais() (1) is called under probe_order (2),
and it will initialize dai_link related settings at *Last* turn (3)(B).
It is very complex code.

	static int soc_probe_link_dais(..., order)
	{
(A)		/* probe DAIs here */
		...

(3)		if (order != SND_SOC_COMP_ORDER_LAST)
			return 0;

(B)		/* initialize dai_link related settings */
		...
	}

	static int snd_soc_instantiate_card(...)
	{
		...
(2)		for_each_comp_order(order) {
			for_each_card_rtds(...) {
(1)				ret = soc_probe_link_dais(..., order);
			}
		}
	}

This patch separes soc_probe_link_dais() into "DAI probe" portion (A),
and dai_link settings portion (B).
The later is named as soc_link_init() by this patch.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87y2z4or1r.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-core.c

+18 −10
Original line number Diff line number Diff line
@@ -1455,19 +1455,13 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais, 
static int soc_probe_link_dais(struct snd_soc_card *card,

		struct snd_soc_pcm_runtime *rtd, int order)

{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_rtdcom_list *rtdcom;

	struct snd_soc_component *component;

	struct snd_soc_dai *codec_dai;

	int i, ret, num;

	int i, ret;



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

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



	/* set default power off timeout */

	rtd->pmdown_time = pmdown_time;



	ret = soc_probe_dai(cpu_dai, order);

	if (ret)

		return ret;
@@ -1479,9 +1473,20 @@ static int soc_probe_link_dais(struct snd_soc_card *card, 
			return ret;

	}



	/* complete DAI probe during last probe */

	if (order != SND_SOC_COMP_ORDER_LAST)

	return 0;

}



static int soc_link_init(struct snd_soc_card *card,

			 struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;

	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;

	struct snd_soc_rtdcom_list *rtdcom;

	struct snd_soc_component *component;

	int ret, num;



	/* set default power off timeout */

	rtd->pmdown_time = pmdown_time;



	/* do machine specific initialization */

	if (dai_link->init) {
@@ -2041,6 +2046,9 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) 
		}

	}



	for_each_card_rtds(card, rtd)

		soc_link_init(card, rtd);



	snd_soc_dapm_link_dai_widgets(card);

	snd_soc_dapm_connect_dai_link_widgets(card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE