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

ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free() 



"rtd"      is handled by soc_xxx_pcm_runtime(), and
"rtd->dev" is handled by soc_rtd_xxx().

There is no reason to separate these, and it makes code complex.
We can free these in the same time.

Here soc_rtd_free() (A) which frees rtd->dev is called from
soc_remove_link_dais() many times (1).
Then, it is using dev_registered flags to avoid multi kfree() (2).
This is no longer needed if we can merge these functions.

	static void soc_remove_link_dais(...)
	{
		...
(1)		for_each_comp_order(order) {
(1)			for_each_card_rtds(card, rtd) {

(A)				soc_rtd_free(rtd);
				...
			}
		}
	}

(A)	static void soc_rtd_free(...)
	{
(2)		if (rtd->dev_registered) {
			/* we don't need to call kfree() for rtd->dev */
			device_unregister(rtd->dev);
(2)			rtd->dev_registered = 0;
		}
	}

This patch merges soc_rtd_free() into soc_free_pcm_runtime().

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


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

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,6 @@ struct snd_soc_pcm_runtime { 
	struct list_head component_list; /* list of connected components */



	/* bit field */

	unsigned int dev_registered:1;

	unsigned int pop_wait:1;

	unsigned int fe_compr:1; /* for Dynamic PCM */

};

sound/soc/soc-core.c

+8 −16
Original line number Diff line number Diff line
@@ -369,6 +369,14 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd) 
	kfree(rtd->codec_dais);

	snd_soc_rtdcom_del_all(rtd);

	list_del(&rtd->list);



	/*

	 * we don't need to call kfree() for rtd->dev

	 * see

	 *	soc_release_rtd_dev()

	 */

	if (rtd->dev)

		device_unregister(rtd->dev);

	kfree(rtd);

}
@@ -434,8 +442,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( 
	rtd->num = card->num_rtd;

	card->num_rtd++;



	rtd->dev_registered = 1;



	return rtd;



free_rtd:
@@ -1169,7 +1175,6 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order) 
	return 0;

}



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

static void soc_remove_link_dais(struct snd_soc_card *card)

{

	int i;
@@ -1179,10 +1184,6 @@ static void soc_remove_link_dais(struct snd_soc_card *card) 


	for_each_comp_order(order) {

		for_each_card_rtds(card, rtd) {



			/* finalize rtd device */

			soc_rtd_free(rtd);



			/* remove the CODEC DAI */

			for_each_rtd_codec_dai(rtd, i, codec_dai)

				soc_remove_dai(codec_dai, order);
@@ -1460,15 +1461,6 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card, 
}

EXPORT_SYMBOL_GPL(snd_soc_remove_dai_link);



static void soc_rtd_free(struct snd_soc_pcm_runtime *rtd)

{

	if (rtd->dev_registered) {

		/* we don't need to call kfree() for rtd->dev */

		device_unregister(rtd->dev);

		rtd->dev_registered = 0;

	}

}



static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,

				struct snd_soc_pcm_runtime *rtd)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE