[alsa-devel] [PATCH 1/4] ASoC: soc-core: add snd_soc_remove_card()
Kuninori Morimoto
kuninori.morimoto.gx at renesas.com
Mon Feb 9 09:52:01 CET 2015
From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
Added snd_soc_remove_card() is termination method of
snd_soc_instantiate_card()
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
sound/soc/soc-core.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 4bfabc7..4837b5d 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1725,6 +1725,14 @@ static int soc_cleanup_card_resources(struct snd_soc_card *card)
}
+static void snd_soc_remove_card(struct snd_soc_card *card)
+{
+ card->instantiated = false;
+ snd_soc_dapm_shutdown(card);
+ soc_cleanup_card_resources(card);
+}
+
+
/* removes a socdev */
static int soc_remove(struct platform_device *pdev)
{
@@ -2393,9 +2401,7 @@ EXPORT_SYMBOL_GPL(snd_soc_register_card);
int snd_soc_unregister_card(struct snd_soc_card *card)
{
if (card->instantiated) {
- card->instantiated = false;
- snd_soc_dapm_shutdown(card);
- soc_cleanup_card_resources(card);
+ snd_soc_remove_card(card);
dev_dbg(card->dev, "ASoC: Unregistered card '%s'\n", card->name);
}
--
1.7.9.5
More information about the Alsa-devel
mailing list