ASoC: soc-component: add snd_soc_component_compr_pointer()

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

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/874klt7v65.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 ba0eb49f888508a7aa7bc23bad8206b69e0367c7..d4e396cc75c2de14b02de7c8baefeba3305b8a70 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -458,6 +458,8 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
 int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
                                           struct snd_compr_codec_caps *codec);
 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_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 832177e5094ebbbd7a1d85e5ed35e52151842336..3ff2f227b99e9591dd2ca4b7da3e82502efe729d 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -591,6 +591,26 @@ int snd_soc_component_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_ack);
 
+int snd_soc_component_compr_pointer(struct snd_compr_stream *cstream,
+                                   struct snd_compr_tstamp *tstamp)
+{
+       struct snd_soc_pcm_runtime *rtd = cstream->private_data;
+       struct snd_soc_component *component;
+       int i, ret;
+
+       for_each_rtd_components(rtd, i, component) {
+               if (component->driver->compress_ops &&
+                   component->driver->compress_ops->pointer) {
+                       ret = component->driver->compress_ops->pointer(
+                               component, cstream, tstamp);
+                       return soc_component_ret(component, ret);
+               }
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_pointer);
+
 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 234e1506ed4359411d8b10e049fc5c603c67f277..eb5cb2f1823e342ca2fc441a6d36fd64987d11ad 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -431,8 +431,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
                             struct snd_compr_tstamp *tstamp)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct snd_soc_component *component;
-       int i, ret = 0;
+       int ret;
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
 
        mutex_lock_nested(&rtd->card->pcm_mutex, rtd->card->pcm_subclass);
@@ -441,15 +440,7 @@ static int soc_compr_pointer(struct snd_compr_stream *cstream,
        if (ret < 0)
                goto out;
 
-       for_each_rtd_components(rtd, i, component) {
-               if (!component->driver->compress_ops ||
-                   !component->driver->compress_ops->pointer)
-                       continue;
-
-               ret = component->driver->compress_ops->pointer(
-                       component, cstream, tstamp);
-               break;
-       }
+       ret = snd_soc_component_compr_pointer(cstream, tstamp);
 out:
        mutex_unlock(&rtd->card->pcm_mutex);
        return ret;