ASoC: soc-component: add snd_soc_component_compr_copy()

component related function should be implemented at
soc-component.c.
This patch adds snd_soc_component_compr_copy().

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/87361d7v5z.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 d4e396cc75c2de14b02de7c8baefeba3305b8a70..535f22502e1e09f3143e91e5a8abe81dbaa990bc 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -460,6 +460,8 @@ int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
 int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes);
 int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,
                                    struct snd_compr_tstamp *tstamp);
+int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
+                                char __user *buf, size_t count);
 
 int snd_soc_pcm_component_pointer(struct snd_pcm_substream *substream);
 int snd_soc_pcm_component_ioctl(struct snd_pcm_substream *substream,

diff --git a/sound/soc/soc-component.c b/sound/soc/soc-component.c
index 3ff2f227b99e9591dd2ca4b7da3e82502efe729d..77fcb6fc42fb71195900806fa9d3849aa70773f5 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -611,6 +611,30 @@ int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer);
 
+int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
+                                char __user *buf, size_t count)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_component *component;
+       int i, ret = 0;
+
+       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
+
+       for_each_rtd_components(rtd, i, component) {
+               if (component->driver->compress_ops &&
+                   component->driver->compress_ops->copy) {
+                       ret = component->driver->compress_ops->copy(
+                               component, cstream, buf, count);
+                       break;
+               }
+       }
+
+       mutex_unlock(&rtd->card->pcm_mutex);
+
+       return soc_component_ret(component, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_copy);
+
 static unsigned int soc_component_read_no_lock(
        struct snd_soc_component *component,
        unsigned int reg)

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index eb5cb2f1823e342ca2fc441a6d36fd64987d11ad..4a202478a8d696b8c766ca98bdd9fa694c5bd17e 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -446,29 +446,6 @@ out:
        return ret;
 }
 
-static int soc_compr_copy(struct snd_compr_stream *cstream,
-                         char __user *buf, size_t count)
-{
-       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct snd_soc_component *component;
-       int i, ret = 0;
-
-       mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
-
-       for_each_rtd_components(rtd, i, component) {
-               if (!component->driver->compress_ops ||
-                   !component->driver->compress_ops->copy)
-                       continue;
-
-               ret = component->driver->compress_ops->copy(
-                       component, cstream, buf, count);
-               break;
-       }
-
-       mutex_unlock(&rtd->card->pcm_mutex);
-       return ret;
-}
-
 static int soc_compr_set_metadata(struct snd_compr_stream *cstream,
                                  struct snd_compr_metadata *metadata)
 {
@@ -649,7 +626,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
                    !component->driver->compress_ops->copy)
                        continue;
 
-               compr->ops->copy = soc_compr_copy;
+               compr->ops->copy = snd_soc_component_compr_copy;
                break;
        }