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 5/6] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card()
Date: 02 Oct 2019 14:23:07 +0900 [thread overview]
Message-ID: <87zhijafgk.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <878sq3bu2t.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 2c2803e..d39d908 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -462,8 +462,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,
@@ -2008,6 +2006,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)
@@ -2418,7 +2417,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-10-02 5:27 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-02 5:22 [alsa-devel] [PATCH 0/6][resend] ASoC: soc-core cleanup - step 3 Kuninori Morimoto
2019-10-02 5:22 ` [alsa-devel] [PATCH 1/6] ASoC: soc-core: use devm_kzalloc() for rtd Kuninori Morimoto
2019-10-02 18:55 ` Mark Brown
2019-10-03 0:31 ` Kuninori Morimoto
2019-10-03 0:56 ` Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-core: use devm_kzalloc() for rtd" to the asoc tree Mark Brown
2019-10-02 5:22 ` [alsa-devel] [PATCH 2/6] ASoC: soc-core: remove soc_remove_dai_links() Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-core: remove soc_remove_dai_links()" to the asoc tree Mark Brown
2019-10-02 5:22 ` [alsa-devel] [PATCH 3/6] ASoC: soc-core: add soc_setup_card_name() Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-core: add soc_setup_card_name()" to the asoc tree Mark Brown
2019-10-02 5:22 ` [alsa-devel] [PATCH 4/6] ASoC: soc-core: use devm_xxx for component related resource Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-core: use devm_xxx for component related resource" to the asoc tree Mark Brown
2019-10-02 5:23 ` [alsa-devel] [PATCH 4/6] ASoC: soc-core: use devm_xxx for component related resource Kuninori Morimoto
2019-10-02 5:23 ` Kuninori Morimoto [this message]
2019-10-02 7:42 ` [alsa-devel] [PATCH 5/6] ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card() Daniel Baluta
2019-10-02 7:59 ` Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-core: setup card->rtd_num at snd_soc_instantiate_card()" to the asoc tree Mark Brown
2019-10-02 5:23 ` [alsa-devel] [PATCH 6/6] ASoC: soc-ops: use snd_soc_card_get_kcontrol() at snd_soc_limit_volume() Kuninori Morimoto
2019-10-04 17:52 ` [alsa-devel] Applied "ASoC: soc-ops: use snd_soc_card_get_kcontrol() at snd_soc_limit_volume()" to the asoc tree Mark Brown
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=87zhijafgk.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).