Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit b006c0c6 authored Sep 04, 2019 by Kuninori Morimoto Committed by Mark Brown Sep 09, 2019

ASoC: soc-core: self contained soc_remove_link_components()



Current soc_remove_link_components() implementation is very half,
thus it is very difficult to read.

	for_each_comp_order(xxx) {
		for_each_card_rtds(xxx)
=>			soc_remove_link_components(xxx);
	}

This patch does all for_each_xxx() under soc_remove_link_components(),
and makes it to self contained.

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


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 62f07a6b

sound/soc/soc-core.c

+15 −18

Original line number	Diff line number	Diff line
		@@ -1123,19 +1123,26 @@ static void soc_remove_link_dais(struct snd_soc_card *card,
		soc_remove_dai(rtd->cpu_dai, order);
		}

		static void soc_remove_link_components(struct snd_soc_card *card,
		struct snd_soc_pcm_runtime *rtd, int order)
		static void soc_remove_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 order;

		for_each_comp_order(order) {
		for_each_card_rtds(card, rtd) {
		for_each_rtdcom(rtd, rtdcom) {
		component = rtdcom->component;

		if (component->driver->remove_order == order)
		if (component->driver->remove_order != order)
		continue;

		soc_remove_component(component);
		}
		}
		}
		}

		static int soc_probe_link_components(struct snd_soc_card *card)
		{
		@@ -1173,10 +1180,7 @@ static void soc_remove_dai_links(struct snd_soc_card *card)
		soc_remove_link_dais(card, rtd, order);
		}

		for_each_comp_order(order) {
		for_each_card_rtds(card, rtd)
		soc_remove_link_components(card, rtd, order);
		}
		soc_remove_link_components(card);

		for_each_card_links_safe(card, link, _link) {
		if (link->dobj.type == SND_SOC_DOBJ_DAI_LINK)
		@@ -2394,20 +2398,13 @@ EXPORT_SYMBOL_GPL(snd_soc_register_card);

		static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
		{
		struct snd_soc_pcm_runtime *rtd;
		int order;

		if (card->instantiated) {
		card->instantiated = false;
		snd_soc_dapm_shutdown(card);
		snd_soc_flush_all_delayed_work(card);

		/* remove all components used by DAI links on this card */
		for_each_comp_order(order) {
		for_each_card_rtds(card, rtd) {
		soc_remove_link_components(card, rtd, order);
		}
		}
		soc_remove_link_components(card);

		soc_cleanup_card_resources(card);
		if (!unregister)