ASoC: soc-core: move snd_soc_unbind_card() next to snd_soc_bind_card()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 13 Nov 2019 01:16:34 +0000 (10:16 +0900)
committerMark Brown <broonie@kernel.org>
Fri, 15 Nov 2019 12:02:21 +0000 (12:02 +0000)
To makes code readable, this patch moves snd_soc_unbind_card() next
to snd_soc_bind_card().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pnhw4lu5.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index 216000a..a149697 100644 (file)
@@ -1973,6 +1973,21 @@ static void soc_cleanup_card_resources(struct snd_soc_card *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)
 {
        struct snd_soc_pcm_runtime *rtd;
@@ -2387,21 +2402,6 @@ int snd_soc_register_card(struct snd_soc_card *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
  *