ASoC: soc-component: add snd_soc_component_trigger()

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/878ssl5rn5.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 fbcd911ac25eaa801793c49af569e1af6d49c790..302e27a89d4718d460e8ca48b1bf6e11af60509d 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -350,5 +350,8 @@ int snd_soc_component_hw_params(struct snd_soc_component *component,
                                struct snd_pcm_hw_params *params);
 int snd_soc_component_hw_free(struct snd_soc_component *component,
                              struct snd_pcm_substream *substream);
+int snd_soc_component_trigger(struct snd_soc_component *component,
+                             struct snd_pcm_substream *substream,
+                             int cmd);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index e2bc34efe5474889c357d3bc919036c0c110e395..cf0d20a877e617536c6d6189af42cf5204ed6250 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -336,3 +336,14 @@ int snd_soc_component_hw_free(struct snd_soc_component *component,
 
        return 0;
 }
+
+int snd_soc_component_trigger(struct snd_soc_component *component,
+                             struct snd_pcm_substream *substream,
+                             int cmd)
+{
+       if (component->driver->ops &&
+           component->driver->ops->trigger)
+               return component->driver->ops->trigger(substream, cmd);
+
+       return 0;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 8c5289904f20f7d2476f5220a250872d8b845576..cd49c2d688c3d669fe69db357deb81c3ab9a943d 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1065,11 +1065,7 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
        for_each_rtdcom(rtd, rtdcom) {
                component = rtdcom->component;
 
-               if (!component->driver->ops ||
-                   !component->driver->ops->trigger)
-                       continue;
-
-               ret = component->driver->ops->trigger(substream, cmd);
+               ret = snd_soc_component_trigger(component, substream, cmd);
                if (ret < 0)
                        return ret;
        }