ASoC: soc-component: add snd_soc_component_remove()

Current ALSA SoC is directly using component->driver->xxx,
thus, it is deep nested, and makes code difficult to read,
and is not good for encapsulation.
This patch adds new snd_soc_component_remove() and use it.

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

diff --git a/include/sound/soc-component.h b/include/sound/soc-component.h
index 34e774efcf699bf1303031f196902b3af20ff7ba..b8480d947901f1621631b1d1bf954ce83e0a4c7a 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -357,5 +357,6 @@ void snd_soc_component_suspend(struct snd_soc_component *component);
 void snd_soc_component_resume(struct snd_soc_component *component);
 int snd_soc_component_is_suspended(struct snd_soc_component *component);
 int snd_soc_component_probe(struct snd_soc_component *component);
+void snd_soc_component_remove(struct snd_soc_component *component);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index b2bfc037519310aea74b9bd022f702e890e6ae9c..eba77ea2b62d04814510184221cf9d29dd9a0ef8 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -374,3 +374,9 @@ int snd_soc_component_probe(struct snd_soc_component *component)
 
        return 0;
 }
+
+void snd_soc_component_remove(struct snd_soc_component *component)
+{
+       if (component->driver->remove)
+               component->driver->remove(component);
+}

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6a422ddae13032a11608a21640ff5a366e8ccccc..6a6403ddf62d660df22785741e49c37ad60efb74 100644 (file)
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -929,8 +929,7 @@ static void soc_remove_component(struct snd_soc_component *component)
        if (!component->card)
                return;
 
-       if (component->driver->remove)
-               component->driver->remove(component);
+       snd_soc_component_remove(component);
 
        soc_cleanup_component(component);
 }