ASoC: soc-component: add snd_soc_component_hw_free()

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_hw_free() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87a7d15rna.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 778a6e7d352dfedd217c3a4d489868c53a92e7f7..fbcd911ac25eaa801793c49af569e1af6d49c790 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -348,5 +348,7 @@ int snd_soc_component_prepare(struct snd_soc_component *component,
 int snd_soc_component_hw_params(struct snd_soc_component *component,
                                struct snd_pcm_substream *substream,
                                struct snd_pcm_hw_params *params);
+int snd_soc_component_hw_free(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 7b6456370da5ace3b590dc06abc77f551aacfbad..e2bc34efe5474889c357d3bc919036c0c110e395 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -326,3 +326,13 @@ int snd_soc_component_hw_params(struct snd_soc_component *component,
 
        return 0;
 }
+
+int snd_soc_component_hw_free(struct snd_soc_component *component,
+                              struct snd_pcm_substream *substream)
+{
+       if (component->driver->ops &&
+           component->driver->ops->hw_free)
+               return component->driver->ops->hw_free(substream);
+
+       return 0;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8be1d22dc87a0f6e7543ec70e710643d0f9f62b4..8c5289904f20f7d2476f5220a250872d8b845576 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -847,6 +847,7 @@ static int soc_pcm_components_hw_free(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;
@@ -854,14 +855,10 @@ static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream,
                if (component == last)
                        break;
 
-               if (!component->driver->ops ||
-                   !component->driver->ops->hw_free)
-                       continue;
-
-               component->driver->ops->hw_free(substream);
+               ret |= snd_soc_component_hw_free(component, substream);
        }
 
-       return 0;
+       return ret;
 }
 
 /*