ASoC: soc-component: add snd_soc_component_close()

Current ALSA SoC is directly using component->driver->ops->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_close() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87ef2d5rnr.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 156b1a5..8dacac9 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -341,5 +341,7 @@ int snd_soc_component_force_enable_pin_unlocked(
 /* component driver ops */
 int snd_soc_component_open(struct snd_soc_component *component,
                           struct snd_pcm_substream *substream);
+int snd_soc_component_close(struct snd_soc_component *component,
+                           struct snd_pcm_substream *substream);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index ada46f9..cee6618 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -295,3 +295,13 @@ int snd_soc_component_open(struct snd_soc_component *component,
 
        return 0;
 }
+
+int snd_soc_component_close(struct snd_soc_component *component,
+                           struct snd_pcm_substream *substream)
+{
+       if (component->driver->ops &&
+           component->driver->ops->close)
+               return component->driver->ops->close(substream);
+
+       return 0;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index caf7028..4848642 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -465,6 +465,7 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_rtdcom_list *rtdcom;
        struct snd_soc_component *component;
+       int ret = 0;
 
        for_each_rtdcom(rtd, rtdcom) {
                component = rtdcom->component;
@@ -472,14 +473,11 @@ static int soc_pcm_components_close(struct snd_pcm_substream *substream,
                if (component == last)
                        break;
 
-               if (component->driver->ops &&
-                   component->driver->ops->close)
-                       component->driver->ops->close(substream);
-
+               ret |= snd_soc_component_close(component, substream);
                snd_soc_component_module_put_when_close(component);
        }
 
-       return 0;
+       return ret;
 }
 
 /*