ASoC: soc-component: add snd_soc_pcm_component_mmap()

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87muh14d02.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 4cab257962a69feaf552df8404789e2341d0f597..dd1ea5d71998bb65052e3add3cdc03b868e47940 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -379,5 +379,7 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
                                    void __user *buf, unsigned long bytes);
 struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
                                        unsigned long offset);
+int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
+                              struct vm_area_struct *vma);
 
 #endif /* __SOC_COMPONENT_H */

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index d503bc9b085056813855ad8b2fa8ad508f41e7e8..2aff1b087522cb974f3164cd5f800df235bfbfda 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -506,3 +506,22 @@ struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
 
        return NULL;
 }
+
+int snd_soc_pcm_component_mmap(struct snd_pcm_substream *substream,
+                              struct vm_area_struct *vma)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_rtdcom_list *rtdcom;
+       struct snd_soc_component *component;
+
+       for_each_rtdcom(rtd, rtdcom) {
+               component = rtdcom->component;
+
+               /* FIXME. it returns 1st mmap now */
+               if (component->driver->ops &&
+                   component->driver->ops->mmap)
+                       return component->driver->ops->mmap(substream, vma);
+       }
+
+       return -EINVAL;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index fe34f2e5d75ed847166799066e6516a1b1cbfd9c..7bbee0d719426cc7a83058592f025e3f748daa60 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2818,27 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
        }
 }
 
-static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,
-                          struct vm_area_struct *vma)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_rtdcom_list *rtdcom;
-       struct snd_soc_component *component;
-
-       for_each_rtdcom(rtd, rtdcom) {
-               component = rtdcom->component;
-
-               if (!component->driver->ops ||
-                   !component->driver->ops->mmap)
-                       continue;
-
-               /* FIXME. it returns 1st mmap now */
-               return component->driver->ops->mmap(substream, vma);
-       }
-
-       return -EINVAL;
-}
-
 /* create a new pcm */
 int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
 {
@@ -2968,7 +2947,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
                if (ops->page)
                        rtd->ops.page           = snd_soc_pcm_component_page;
                if (ops->mmap)
-                       rtd->ops.mmap           = soc_rtdcom_mmap;
+                       rtd->ops.mmap           = snd_soc_pcm_component_mmap;
        }
 
        if (playback)