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

ASoC: soc-core: move soc_probe_link_dais() next to soc_remove_link_dais() 



It is easy to read code if it is cleanly using paired function/naming,
like start <-> stop, register <-> unregister, etc, etc.
But, current ALSA SoC code is very random, unbalance, not paired, etc.
It is easy to create bug at the such code, and it will be difficult to
debug.

This patch moves soc_probe_link_dais() next to soc_remove_link_dais()
which is paired function.

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


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

sound/soc/soc-core.c

+29 −29
Original line number Diff line number Diff line
@@ -1149,6 +1149,35 @@ static void soc_remove_link_dais(struct snd_soc_card *card) 
	}

}



static int soc_probe_link_dais(struct snd_soc_card *card)

{

	struct snd_soc_dai *codec_dai;

	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",

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



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

			if (ret)

				return ret;



			/* probe the CODEC DAI */

			for_each_rtd_codec_dai(rtd, i, codec_dai) {

				ret = soc_probe_dai(codec_dai, order);

				if (ret)

					return ret;

			}

		}

	}



	return 0;

}



static void soc_remove_link_components(struct snd_soc_card *card)

{

	struct snd_soc_component *component;
@@ -1452,35 +1481,6 @@ 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_dai *codec_dai;

	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",

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



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

			if (ret)

				return ret;



			/* probe the CODEC DAI */

			for_each_rtd_codec_dai(rtd, i, codec_dai) {

				ret = soc_probe_dai(codec_dai, order);

				if (ret)

					return ret;

			}

		}

	}



	return 0;

}



static int soc_link_init(struct snd_soc_card *card,

			 struct snd_soc_pcm_runtime *rtd)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE