ASoC: soc-component: add snd_soc_pcm_component_page()

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

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

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 20897dce1becdcb08d465604e128eedec3ae3a5b..d503bc9b085056813855ad8b2fa8ad508f41e7e8 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -483,3 +483,26 @@ int snd_soc_pcm_component_copy_user(struct snd_pcm_substream *substream,
 
        return -EINVAL;
 }
+
+struct page *snd_soc_pcm_component_page(struct snd_pcm_substream *substream,
+                                       unsigned long offset)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_rtdcom_list *rtdcom;
+       struct snd_soc_component *component;
+       struct page *page;
+
+       for_each_rtdcom(rtd, rtdcom) {
+               component = rtdcom->component;
+
+               /* FIXME. it returns 1st page now */
+               if (component->driver->ops &&
+                   component->driver->ops->page) {
+                       page = component->driver->ops->page(substream, offset);
+                       if (page)
+                               return page;
+               }
+       }
+
+       return NULL;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index b0e6ce89b0129451d43b88fec1d8c0bb106bb618..fe34f2e5d75ed847166799066e6516a1b1cbfd9c 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2818,30 +2818,6 @@ static void soc_pcm_private_free(struct snd_pcm *pcm)
        }
 }
 
-static struct page *soc_rtdcom_page(struct snd_pcm_substream *substream,
-                                   unsigned long offset)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_rtdcom_list *rtdcom;
-       struct snd_soc_component *component;
-       struct page *page;
-
-       for_each_rtdcom(rtd, rtdcom) {
-               component = rtdcom->component;
-
-               if (!component->driver->ops ||
-                   !component->driver->ops->page)
-                       continue;
-
-               /* FIXME. it returns 1st page now */
-               page = component->driver->ops->page(substream, offset);
-               if (page)
-                       return page;
-       }
-
-       return NULL;
-}
-
 static int soc_rtdcom_mmap(struct snd_pcm_substream *substream,
                           struct vm_area_struct *vma)
 {
@@ -2990,7 +2966,7 @@ int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num)
                if (ops->copy_user)
                        rtd->ops.copy_user      = snd_soc_pcm_component_copy_user;
                if (ops->page)
-                       rtd->ops.page           = soc_rtdcom_page;
+                       rtd->ops.page           = snd_soc_pcm_component_page;
                if (ops->mmap)
                        rtd->ops.mmap           = soc_rtdcom_mmap;
        }