ASoC: soc-component: add snd_soc_pcm_component_pointer()

Current ALSA SoC is directly using component->driver->ops->xxx,
thus, the code nested deeply, and it makes code difficult to read,
and is not good for encapsulation.

We want to implement component related function at soc-component.c,
but, some of them need to care whole snd_soc_pcm_runtime (= rtd)
connected component.

Let's call component related function which need to care with
for_each_rtdcom() loop as snd_soc_pcm_component_xxx().
This patch adds new snd_soc_pcm_component_pointer() and use it.

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

2 files changed, 19 insertions, 12 deletions

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index cb63df6e46eb..e2053c8bf1f0 100644
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -424,3 +424,21 @@ int snd_soc_component_of_xlate_dai_name(struct snd_soc_component *component,
                                                      args, dai_name);
         return -ENOTSUPP;
 }
+
+int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream)
+{
+        struct snd_soc_pcm_runtime *rtd = substream->private_data;
+        struct snd_soc_component *component;
+        struct snd_soc_rtdcom_list *rtdcom;
+
+        for_each_rtdcom(rtd, rtdcom) {
+                component = rtdcom->component;
+
+                /* FIXME: use 1st pointer */
+                if (component->driver->ops &&
+                    component->driver->ops->pointer)
+                        return component->driver->ops->pointer(substream);
+        }
+
+        return 0;
+}
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index cd49c2d688c3..020e1d275076 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1111,8 +1111,6 @@ static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
 static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_component *component;
-        struct snd_soc_rtdcom_list *rtdcom;
         struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
         struct snd_soc_dai *codec_dai;
         struct snd_pcm_runtime *runtime = substream->runtime;
@@ -1124,17 +1122,8 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
         /* clearing the previous total delay */
         runtime->delay = 0;
 
-        for_each_rtdcom(rtd, rtdcom) {
-                component = rtdcom->component;
+        offset = snd_soc_pcm_component_pointer(substream);
 
-                if (!component->driver->ops ||
-                    !component->driver->ops->pointer)
-                        continue;
-
-                /* FIXME: use 1st pointer */
-                offset = component->driver->ops->pointer(substream);
-                break;
-        }
         /* base delay if assigned in pointer callback */
         delay = runtime->delay;