ASoC: soc-core: add soc_unbind_aux_dev()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 4 Sep 2019 00:15:35 +0000 (09:15 +0900)
committerMark Brown <broonie@kernel.org>
Mon, 9 Sep 2019 10:03:59 +0000 (11:03 +0100)
It is easy to read code if it is cleanly using paired function/naming,
like start <-> stop, register <-> unregister, etc, etc.
But, current ALSA SoC code is very random, unbalance, not paired, etc.
It is easy to create bug at the such code, and it will be difficult to
debug.

soc-core.c has soc_bind_aux_dev(), but, there is no its paired
soc_unbind_aux_dev().
This patch adds soc_unbind_aux_dev().

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

index d7761df03e19d83a7613366c6b4fdb2d9aad1058..2960070e68bc8d308e98ee18453b9553ec0d7389 100644 (file)
@@ -1559,6 +1559,12 @@ static int soc_link_init(struct snd_soc_card *card,
        return ret;
 }
 
+static void soc_unbind_aux_dev(struct snd_soc_component *component)
+{
+       component->init = NULL;
+       list_del(&component->card_aux_list);
+}
+
 static int soc_bind_aux_dev(struct snd_soc_card *card)
 {
        struct snd_soc_component *component;
@@ -1612,7 +1618,7 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
                        if (comp->driver->remove_order == order) {
                                soc_remove_component(comp);
                                /* remove it from the card's aux_comp_list */
-                               list_del(&comp->card_aux_list);
+                               soc_unbind_aux_dev(comp);
                        }
                }
        }