Commit 2cc1afcf authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown

ASoC: soc-core: move snd_soc_unbind_card() next to snd_soc_bind_card()

To makes code readable, this patch moves snd_soc_unbind_card() next
to snd_soc_bind_card().
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pnhw4lu5.wl-kuninori.morimoto.gx@renesas.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 2a6f0892
...@@ -1973,6 +1973,21 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card) ...@@ -1973,6 +1973,21 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
card->remove(card); card->remove(card);
} }
static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
{
if (card->instantiated) {
card->instantiated = false;
snd_soc_flush_all_delayed_work(card);
soc_cleanup_card_resources(card);
if (!unregister)
list_add(&card->list, &unbind_card_list);
} else {
if (unregister)
list_del(&card->list);
}
}
static int snd_soc_bind_card(struct snd_soc_card *card) static int snd_soc_bind_card(struct snd_soc_card *card)
{ {
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
...@@ -2387,21 +2402,6 @@ int snd_soc_register_card(struct snd_soc_card *card) ...@@ -2387,21 +2402,6 @@ int snd_soc_register_card(struct snd_soc_card *card)
} }
EXPORT_SYMBOL_GPL(snd_soc_register_card); EXPORT_SYMBOL_GPL(snd_soc_register_card);
static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister)
{
if (card->instantiated) {
card->instantiated = false;
snd_soc_flush_all_delayed_work(card);
soc_cleanup_card_resources(card);
if (!unregister)
list_add(&card->list, &unbind_card_list);
} else {
if (unregister)
list_del(&card->list);
}
}
/** /**
* snd_soc_unregister_card - Unregister a card with the ASoC core * snd_soc_unregister_card - Unregister a card with the ASoC core
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment