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 13/13] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card()
Date: 10 Sep 2019 11:06:23 +0900 [thread overview]
Message-ID: <87k1aglxb4.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>
card->rtd_num is used to count rtd. Initialize it at
snd_soc_instantiate_card() is very natural and less confusion.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index bde885f..a5683da 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -451,8 +451,6 @@ static void soc_remove_pcm_runtimes(struct snd_soc_card *card)
for_each_card_rtds_safe(card, rtd, _rtd)
soc_free_pcm_runtime(rtd);
-
- card->num_rtd = 0;
}
struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card,
@@ -1997,6 +1995,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
goto probe_end;
/* add predefined DAI links to the list */
+ card->num_rtd = 0;
for_each_card_prelinks(card, i, dai_link) {
ret = snd_soc_add_dai_link(card, dai_link);
if (ret < 0)
@@ -2407,7 +2406,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
INIT_LIST_HEAD(&card->dapm_dirty);
INIT_LIST_HEAD(&card->dobj_list);
- card->num_rtd = 0;
card->instantiated = 0;
mutex_init(&card->mutex);
mutex_init(&card->dapm_mutex);
--
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:15 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 ` [alsa-devel] [PATCH 06/13] ASoC: soc-core: merge soc_free_pcm_runtime() and soc_rtd_free() Kuninori Morimoto
2019-09-10 15:33 ` 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 ` Kuninori Morimoto [this message]
2019-09-10 16:14 ` [alsa-devel] [PATCH 13/13] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card() 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=87k1aglxb4.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).