| Message ID | 87zhijafgk.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ASoC: soc-core cleanup - step 3 | expand |
On Wed, Oct 2, 2019 at 8:27 AM Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > > 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; Shouldn't this be placed before the comment above? > 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
Hi Daniel Thank you for your feedback > > @@ -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; > > Shouldn't this be placed before the comment above? > > > for_each_card_prelinks(card, i, dai_link) { > > ret = snd_soc_add_dai_link(card, dai_link); > > if (ret < 0) It is used under this for_each_card_prelinks() loop. card->num_rtd setup and this loop are 1 set. Thus, I added it under comment. Thank you for your help !! Best regards --- Kuninori Morimoto
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);