Alsa-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [alsa-devel] [PATCH v2 07/14] ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order
Date: 12 Sep 2019 13:42:30 +0900
Message-ID: <877e6ef7m1.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87h85if7u8.wl-kuninori.morimoto.gx@renesas.com>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch allocs dev first at soc_new_pcm_runtime().
This is prepare for rtd->dev, rtd->codec_dais alloc cleanup

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2

	- add new comment for rtd->dev
	- call device_unregister() without if check
	  (it done at [09/14] in v1)

 sound/soc/soc-core.c | 55 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 32 insertions(+), 23 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index f34d3f9..0ffa780 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -125,6 +125,9 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
 	struct device *dev = kobj_to_dev(kobj);
 	struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
 
+	if (!rtd)
+		return 0;
+
 	if (attr == &dev_attr_pmdown_time.attr)
 		return attr->mode; /* always visible */
 	return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */
@@ -374,9 +377,13 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd)
 	 * we don't need to call kfree() for rtd->dev
 	 * see
 	 *	soc_release_rtd_dev()
+	 *
+	 * We don't need rtd->dev NULL check, because
+	 * it is alloced *before* rtd.
+	 * see
+	 *	soc_new_pcm_runtime()
 	 */
-	if (rtd->dev)
-		device_unregister(rtd->dev);
+	device_unregister(rtd->dev);
 	kfree(rtd);
 }
 
@@ -384,15 +391,38 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
 	struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
 {
 	struct snd_soc_pcm_runtime *rtd;
+	struct device *dev;
 	int ret;
 
 	/*
+	 * for rtd->dev
+	 */
+	dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+	if (!dev)
+		return NULL;
+
+	dev->parent	= card->dev;
+	dev->release	= soc_release_rtd_dev;
+	dev->groups	= soc_dev_attr_groups;
+
+	dev_set_name(dev, "%s", dai_link->name);
+
+	ret = device_register(dev);
+	if (ret < 0) {
+		put_device(dev); /* soc_release_rtd_dev */
+		return NULL;
+	}
+
+	/*
 	 * for rtd
 	 */
 	rtd = kzalloc(sizeof(struct snd_soc_pcm_runtime), GFP_KERNEL);
 	if (!rtd)
 		goto free_rtd;
 
+	rtd->dev = dev;
+	dev_set_drvdata(dev, rtd);
+
 	/*
 	 * for rtd->codec_dais
 	 */
@@ -403,27 +433,6 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
 		goto free_rtd;
 
 	/*
-	 * for rtd->dev
-	 */
-	rtd->dev = kzalloc(sizeof(struct device), GFP_KERNEL);
-	if (!rtd->dev)
-		goto free_rtd;
-
-	rtd->dev->parent = card->dev;
-	rtd->dev->release = soc_release_rtd_dev;
-	rtd->dev->groups = soc_dev_attr_groups;
-
-	dev_set_name(rtd->dev, "%s", dai_link->name);
-	dev_set_drvdata(rtd->dev, rtd);
-
-	ret = device_register(rtd->dev);
-	if (ret < 0) {
-		put_device(rtd->dev); /* soc_release_rtd_dev */
-		rtd->dev = NULL;
-		goto free_rtd;
-	}
-
-	/*
 	 * rtd remaining settings
 	 */
 	INIT_LIST_HEAD(&rtd->component_list);
-- 
2.7.4

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

  parent 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 ` Kuninori Morimoto [this message]
2019-10-01 11:40   ` [alsa-devel] Applied "ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order" " 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   ` [alsa-devel] Applied "ASoC: soc-core: remove snd_soc_rtdcom_del_all()" to the asoc tree Mark Brown
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=877e6ef7m1.wl-kuninori.morimoto.gx@renesas.com \
    --to=kuninori.morimoto.gx@renesas.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    /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