ASoC: soc-core: move soc_probe_link_components() position (6fb03550) · Commits · 戴 / test

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. soc_probe_link_components() has paired soc_remove_link_components(), but, these are implemented at different place. So it is difficult to confirm code. This patch moves soc_probe_link_components() next to soc_remove_link_components(). Signed-off-by:

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

Mark Brown <broonie@kernel.org>

sound/soc/soc-core.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -1135,6 +1135,26 @@ 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)
		{
		struct snd_soc_component *component;
		struct snd_soc_rtdcom_list *rtdcom;
		int ret;

		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;
		}
		}

		return 0;
		}

		static void soc_remove_dai_links(struct snd_soc_card *card)
		{
		int order;
		@@ -1379,26 +1399,6 @@ static int soc_rtd_init(struct snd_soc_pcm_runtime rtd, const char name)
		return 0;
		}

		static int soc_probe_link_components(struct snd_soc_card *card,
		struct snd_soc_pcm_runtime *rtd, int order)
		{
		struct snd_soc_component *component;
		struct snd_soc_rtdcom_list *rtdcom;
		int ret;

		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;
		}
		}

		return 0;
		}

		static int soc_probe_dai(struct snd_soc_dai *dai, int order)
		{
		int ret;

Admin message