ASoC: soc-core: merge card resources cleanup method
PATCH 1/1 ASoC: soc-core: merge card resources cleanup method
From: Kuninori Morimoto <[email protected]>
We need to cleanup card resources when snd_soc_instantiate_card() was failed, or when snd_soc_unbind_card() was called.
But they are cleanuping card resources on each way.
Same code in many places makes code un-understandable.
This patch reuses soc_cleanup_card_resources() for cleanuping code resource. Then, it makes avoiding cleanup order.
It will be called from snd_soc_instantiate_card() and snd_soc_unbind_card().
Then, original soc_cleanup_card_resources() included snd_soc_flush_all_delayed_work(), but it is now separated.
Signed-off-by Kuninori Morimoto <[email protected]>
--- sound/soc/soc-core.c | 103 +++++++++++++++++++++------------------------------ 1 file changed, 43 insertions(+), 60 deletions(-)
sound/soc/soc-core.c +43 -60
@@ -1980,6 +1980,29 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) } } +static int soc_cleanup_card_resources (struct snd_soc_card *card) +{ +/* free the ALSA card at first; this syncs with pending operations */ +if (card->snd_card) +snd_card_free (card->snd_card); + +/* remove and free each DAI */ +soc_remove_dai_links (card); +soc_remove_pcm_runtimes (card); + +/* remove auxiliary devices */ +soc_remove_aux_devices (card); + +snd_soc_dapm_free (&card->dapm); +soc_cleanup_card_debugfs (card); + +/* remove the card */ +if (card->remove) + card->remove (card); + +return 0 ; +} +static int snd_soc_instantiate_card (struct snd_soc_card *card) {struct snd_soc_pcm_runtime *rtd;
@@ -1989,6 +2012,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)mutex_lock (&client_mutex);mutex_lock_nested (&card->mutex,SND_SOC_CARD_CLASS_INIT ); + card->dapm.bias_level =SND_SOC_BIAS_OFF ; + card->dapm.dev = card->dev; + card->dapm.card = card; +list_add (&card->dapm.list, &card->dapm_list); +/* check whether any platform is ignore machine FE and using topology */ soc_check_tplg_fes (card);
@@ -1996,14 +2024,14 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)for_each_card_prelinks (card, i, dai_link) { ret =soc_bind_dai_link (card, dai_link);if (ret !=0 ) - goto base_error; + goto probe_end; }/* bind aux_devs too */ for (i =0 ; i < card->num_aux_devs; i++) { ret =soc_bind_aux_dev (card, i);if (ret !=0 ) - goto base_error; + goto probe_end; }/* add predefined DAI links to the list */
@@ -2017,16 +2045,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)dev_err (card->dev,"ASoC: can't create sound card for card %s: %d\n" , card->name, ret); - goto base_error; + goto probe_end; }soc_init_card_debugfs (card); - card->dapm.bias_level =SND_SOC_BIAS_OFF ; - card->dapm.dev = card->dev; - card->dapm.card = card; -list_add (&card->dapm.list, &card->dapm_list); -#ifdef CONFIG_DEBUG_FS snd_soc_dapm_debugfs_init (&card->dapm, card->debugfs_card_root);#endif
@@ -2048,7 +2071,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)if (card->probe) { ret = card->probe (card);if (ret <0 ) - goto card_probe_error; + goto probe_end; }/* probe all components used by DAI links on this card */
@@ -2059,7 +2082,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)dev_err (card->dev,"ASoC: failed to instantiate card %d\n" , ret); - goto probe_dai_err; + goto probe_end; } } }
@@ -2067,7 +2090,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)/* probe auxiliary components */ ret =soc_probe_aux_devices (card);if (ret <0 ) - goto probe_dai_err; + goto probe_end;/* * Find new DAI links added during probing components and bind them.
@@ -2079,10 +2102,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ret =soc_init_dai_link (card, dai_link);if (ret) - goto probe_dai_err; + goto probe_end; ret =soc_bind_dai_link (card, dai_link);if (ret) - goto probe_dai_err; + goto probe_end; }/* probe all DAI links on this card */
@@ -2093,7 +2116,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)dev_err (card->dev,"ASoC: failed to instantiate card %d\n" , ret); - goto probe_dai_err; + goto probe_end; } } }
@@ -2140,7 +2163,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)if (ret <0 ) {dev_err (card->dev,"ASoC: %s late_probe() failed: %d\n" , card->name, ret); - goto probe_aux_dev_err; + goto probe_end; } }
@@ -2150,33 +2173,17 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)if (ret <0 ) {dev_err (card->dev,"ASoC: failed to register soundcard %d\n" , ret); - goto probe_aux_dev_err; + goto probe_end; } card->instantiated =1 ;dapm_mark_endpoints_dirty (card);snd_soc_dapm_sync (&card->dapm); -mutex_unlock (&card->mutex); -mutex_unlock (&client_mutex); - -return 0 ; -probe_aux_dev_err: -soc_remove_aux_devices (card); - -probe_dai_err: -soc_remove_dai_links (card); - -card_probe_error: -if (card->remove) - card->remove (card); - -snd_soc_dapm_free (&card->dapm); -soc_cleanup_card_debugfs (card); -snd_card_free (card->snd_card); +probe_end: +if (ret <0 ) +soc_cleanup_card_resources (card); -base_error: -soc_remove_pcm_runtimes (card);mutex_unlock (&card->mutex);mutex_unlock (&client_mutex);
@@ -2205,31 +2212,6 @@ static int soc_probe(struct platform_device *pdev)return snd_soc_register_card (card); } -static int soc_cleanup_card_resources (struct snd_soc_card *card) -{ -/* make sure any delayed work runs */ -snd_soc_flush_all_delayed_work (card); - -/* free the ALSA card at first; this syncs with pending operations */ -snd_card_free (card->snd_card); - -/* remove and free each DAI */ -soc_remove_dai_links (card); -soc_remove_pcm_runtimes (card); - -/* remove auxiliary devices */ -soc_remove_aux_devices (card); - -snd_soc_dapm_free (&card->dapm); -soc_cleanup_card_debugfs (card); - -/* remove the card */ -if (card->remove) - card->remove (card); - -return 0 ; -} -/* removes a socdev */ static int soc_remove (struct platform_device *pdev) {
@@ -2795,6 +2777,7 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)if (card->instantiated) { card->instantiated = false;snd_soc_dapm_shutdown (card); +snd_soc_flush_all_delayed_work (card);soc_cleanup_card_resources (card);if (!unregister)list_add (&card->list, &unbind_card_list);
Signature · 1 line
2.7.4