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

ASoC: soc-core: self contained soc_remove_link_dais() 



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

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

This patch does all for_each_xxx() under soc_remove_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/871rwwq5mm.wl-kuninori.morimoto.gx@renesas.com


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

sound/soc/soc-core.c

+15 −14
Original line number Diff line number Diff line
@@ -1107,11 +1107,15 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) 
}



static void soc_rtd_free(struct snd_soc_pcm_runtime *rtd); /* remove me */

static void soc_remove_link_dais(struct snd_soc_card *card,

		struct snd_soc_pcm_runtime *rtd, int order)

static void soc_remove_link_dais(struct snd_soc_card *card)

{

	int i;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_pcm_runtime *rtd;

	int order;



	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd) {



			/* finalize rtd device */

			soc_rtd_free(rtd);
@@ -1122,6 +1126,8 @@ 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)

{
@@ -1171,14 +1177,9 @@ static int soc_probe_link_components(struct snd_soc_card *card) 


static void soc_remove_dai_links(struct snd_soc_card *card)

{

	int order;

	struct snd_soc_pcm_runtime *rtd;

	struct snd_soc_dai_link *link, *_link;



	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd)

			soc_remove_link_dais(card, rtd, order);

	}

	soc_remove_link_dais(card);



	soc_remove_link_components(card);

CRA Git | Maintained and supported by SUSTech CRA and CCSE