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 06/13] ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free()
Date: 10 Sep 2019 11:05:41 +0900 [thread overview]
Message-ID: <87tv9klxca.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <8736h4nby1.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
"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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
include/sound/soc.h | 1 -
sound/soc/soc-core.c | 18 ++----------------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index f264c65..d93cb46 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -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 */
};
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b550fa9..552f460 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -368,6 +368,8 @@ static void soc_free_pcm_runtime(struct snd_soc_pcm_runtime *rtd)
kfree(rtd->codec_dais);
snd_soc_rtdcom_del_all(rtd);
+ if (rtd->dev)
+ device_unregister(rtd->dev); /* soc_release_rtd_dev */
list_del(&rtd->list);
kfree(rtd);
}
@@ -434,8 +436,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 +1169,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 +1178,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 +1455,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)
{
--
2.7.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-09-10 2:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 2:04 [alsa-devel] [PATCH 00/13] ASoC: soc-core cleanup - step 3 Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 01/13] ASoC: soc-core: move soc_free_pcm_runtime() Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 02/13] ASoC: soc-core: merge soc_add_pcm_runtime() into soc_new_pcm_runtime() Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 03/13] ASoC: soc-core: call list_del(&rtd->list) at soc_free_pcm_runtime() Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 04/13] ASoC: soc-core: create rtd->codec_dais first Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 05/13] ASoC: soc-core: merge soc_new_pcm_runtime() and soc_rtd_init() Kuninori Morimoto
2019-09-10 2:05 ` Kuninori Morimoto [this message]
2019-09-10 15:33 ` [alsa-devel] [PATCH 06/13] ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free() Sridharan, Ranjani
2019-09-10 23:57 ` Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 07/13] ASoC: soc-core: tidyup soc_new_pcm_runtime() alloc order Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 08/13] ASoC: soc-core: remove snd_soc_rtdcom_del_all() Kuninori Morimoto
2019-09-10 2:05 ` [alsa-devel] [PATCH 09/13] ASoC: soc-core: use devm_kzalloc() for rtd Kuninori Morimoto
2019-09-10 15:45 ` Sridharan, Ranjani
2019-09-10 23:54 ` Kuninori Morimoto
2019-09-10 2:06 ` [alsa-devel] [PATCH 10/13] ASoC: soc-core: remove soc_remove_dai_links() Kuninori Morimoto
2019-09-10 2:06 ` [alsa-devel] [PATCH 11/13] ASoC: soc-core: add soc_setup_card_name() Kuninori Morimoto
2019-09-10 2:06 ` [alsa-devel] [PATCH 12/13] ASoC: soc-core: use devm_xxx for component related resource Kuninori Morimoto
2019-09-10 2:06 ` [alsa-devel] [PATCH 13/13] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card() Kuninori Morimoto
2019-09-10 16:14 ` Sridharan, Ranjani
2019-09-11 0:00 ` Kuninori Morimoto
Reply instructions:
You may reply publicly 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=87tv9klxca.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).