Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>,
	Mark Brown <broonie@kernel.org>
Subject: [alsa-devel] Applied "ASoC: soc-core: remove snd_soc_rtdcom_del_all()" to the asoc tree
Date: Tue,  1 Oct 2019 12:40:48 +0100 (BST)
Message-ID: <20191001114048.6BAB12742A10@ypsilon.sirena.org.uk> (raw)
In-Reply-To: <875zlyf7ln.wl-kuninori.morimoto.gx@renesas.com>

The patch

   ASoC: soc-core: remove snd_soc_rtdcom_del_all()

has been applied to the asoc tree at

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

From 353e16bf60458fae5927cf04ff668fc152fff465 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 12 Sep 2019 13:42:44 +0900
Subject: [PATCH] ASoC: soc-core: remove snd_soc_rtdcom_del_all()

If we can use devm_kzalloc(rtd->dev, xxx) for rtdcom,
we don't need to call snd_soc_rtdcom_del_all() for kfree().
This patch uses devm_kzalloc(rtd->dev, xxx) for rtdcom,
and remove snd_soc_rtdcom_del_all().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/875zlyf7ln.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/soc-core.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b72207412c73..d2842a383846 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -288,28 +288,29 @@ static int snd_soc_rtdcom_add(struct snd_soc_pcm_runtime *rtd,
 			return 0;
 	}
 
-	rtdcom = kmalloc(sizeof(*rtdcom), GFP_KERNEL);
+	/*
+	 * created rtdcom here will be freed when rtd->dev was freed.
+	 * see
+	 *	soc_free_pcm_runtime() :: device_unregister(rtd->dev)
+	 */
+	rtdcom = devm_kzalloc(rtd->dev, sizeof(*rtdcom), GFP_KERNEL);
 	if (!rtdcom)
 		return -ENOMEM;
 
 	rtdcom->component = component;
 	INIT_LIST_HEAD(&rtdcom->list);
 
+	/*
+	 * When rtd was freed, created rtdcom here will be
+	 * also freed.
+	 * And we don't need to call list_del(&rtdcom->list)
+	 * when freed, because rtd is also freed.
+	 */
 	list_add_tail(&rtdcom->list, &rtd->component_list);
 
 	return 0;
 }
 
-static void snd_soc_rtdcom_del_all(struct snd_soc_pcm_runtime *rtd)
-{
-	struct snd_soc_rtdcom_list *rtdcom1, *rtdcom2;
-
-	for_each_rtdcom_safe(rtd, rtdcom1, rtdcom2)
-		kfree(rtdcom1);
-
-	INIT_LIST_HEAD(&rtd->component_list);
-}
-
 struct snd_soc_component *snd_soc_rtdcom_lookup(struct snd_soc_pcm_runtime *rtd,
 						const char *driver_name)
 {
@@ -370,7 +371,6 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd)
 		return;
 
 	kfree(rtd->codec_dais);
-	snd_soc_rtdcom_del_all(rtd);
 	list_del(&rtd->list);
 
 	/*
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  reply index

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-12  4:37 [alsa-devel] [PATCH v2 00/14] ASoC: soc-core cleanup - step 3 Kuninori Morimoto
2019-09-12  4:38 ` [alsa-devel] [PATCH v2 01/14] ASoC: soc-core: move soc_free_pcm_runtime() Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: move soc_free_pcm_runtime()" to the asoc tree Mark Brown
2019-09-12  4:38 ` [alsa-devel] [PATCH v2 02/14] ASoC: soc-core: merge soc_add_pcm_runtime() into soc_new_pcm_runtime() Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: merge soc_add_pcm_runtime() into soc_new_pcm_runtime()" to the asoc tree Mark Brown
2019-09-12  4:38 ` [alsa-devel] [PATCH v2 03/14] ASoC: soc-core: call list_del(&rtd->list) at soc_free_pcm_runtime() Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: call list_del(&rtd->list) at soc_free_pcm_runtime()" to the asoc tree Mark Brown
2019-09-12  4:39 ` [alsa-devel] [PATCH v2 04/14] ASoC: soc-core: create rtd->codec_dais first Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: create rtd->codec_dais first" to the asoc tree Mark Brown
2019-09-12  4:40 ` [alsa-devel] [PATCH v2 05/14] ASoC: soc-core: merge soc_new_pcm_runtime() and soc_rtd_init() Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: merge soc_new_pcm_runtime() and soc_rtd_init()" to the asoc tree Mark Brown
2019-09-12  4:41 ` [alsa-devel] [PATCH v2 06/14] ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free() Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free()" to the asoc tree Mark Brown
2019-09-12  4:42 ` [alsa-devel] [PATCH v2 07/14] ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order Kuninori Morimoto
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order" to the asoc tree Mark Brown
2019-09-12  4:42 ` [alsa-devel] [PATCH v2 08/14] ASoC: soc-core: remove snd_soc_rtdcom_del_all() Kuninori Morimoto
2019-10-01 11:40   ` Mark Brown [this message]
2019-09-12  4:43 ` [alsa-devel] [PATCH v2 09/14] ASoC: soc-core: use devm_kzalloc() for rtd Kuninori Morimoto
2019-09-12  4:43 ` [alsa-devel] [PATCH v2 10/14] ASoC: soc-core: remove soc_remove_dai_links() Kuninori Morimoto
2019-09-12  4:43 ` [alsa-devel] [PATCH v2 11/14] ASoC: soc-core: add soc_setup_card_name() Kuninori Morimoto
2019-09-12  4:44 ` [alsa-devel] [PATCH v2 12/14] ASoC: soc-core: use devm_xxx for component related resource Kuninori Morimoto
2019-09-12  4:44 ` [alsa-devel] [PATCH v2 13/14] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card() Kuninori Morimoto
2019-09-12  4:44 ` [alsa-devel] [PATCH v2 14/14] ASoC: soc-ops: use snd_soc_card_get_kcontrol() at snd_soc_limit_volume() Kuninori Morimoto

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191001114048.6BAB12742A10@ypsilon.sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=kuninori.morimoto.gx@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Alsa-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/alsa-devel/0 alsa-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 alsa-devel alsa-devel/ https://lore.kernel.org/alsa-devel \
		alsa-devel@alsa-project.org
	public-inbox-index alsa-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.alsa-project.alsa-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git