ASoC: soc-core: self contained soc_unbind_aux_dev()

Current soc_unbind_aux_dev() implementation is very half,
thus it is very unreadable.

	for_each_comp_order(order) {
		for_each_card_auxs_safe(card, comp, _comp) {

(1)			if (comp->driver->remove_order == order) {
				...
=>				soc_unbind_aux_dev(comp);
			}
	}

soc_unbind_aux_dev() itself is not related to remove_order (1).
And, it is called from soc_remove_aux_devices(), even though
its paired function soc_bind_aux_dev() is called from
snd_soc_instantiate_card().
It is very unbalance, and very difficult to understand.

This patch do
1) update soc_bind_aux_dev() to self contained
2) call it from soc_cleanup_card_resources() to make up balance

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

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 2960070e68bc8d308e98ee18453b9553ec0d7389..35f48e9c5ead69a8075ed1133b13167461b08013 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1559,10 +1559,14 @@ static int soc_link_init(struct snd_soc_card *card,
        return ret;
 }
 
-static void soc_unbind_aux_dev(struct snd_soc_component *component)
+static void soc_unbind_aux_dev(struct snd_soc_card *card)
 {
-       component->init = NULL;
-       list_del(&component->card_aux_list);
+       struct snd_soc_component *component, *_component;
+
+       for_each_card_auxs_safe(card, component, _component) {
+               component->init = NULL;
+               list_del(&component->card_aux_list);
+       }
 }
 
 static int soc_bind_aux_dev(struct snd_soc_card *card)
@@ -1614,12 +1618,8 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
 
        for_each_comp_order(order) {
                for_each_card_auxs_safe(card, comp, _comp) {
-
-                       if (comp->driver->remove_order == order) {
+                       if (comp->driver->remove_order == order)
                                soc_remove_component(comp);
-                               /* remove it from the card's aux_comp_list */
-                               soc_unbind_aux_dev(comp);
-                       }
                }
        }
 }
@@ -1932,6 +1932,7 @@ static void soc_cleanup_card_resources(struct snd_soc_card *card)
 
        /* remove auxiliary devices */
        soc_remove_aux_devices(card);
+       soc_unbind_aux_dev(card);
 
        snd_soc_dapm_free(&card->dapm);
        soc_cleanup_card_debugfs(card);