ASoC: soc-component: add snd_soc_component_compr_get_metadata()

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

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/87zh3l6gl8.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 d23ebd5..984dd73 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -464,6 +464,8 @@ int snd_soc_component_compr_copy(struct snd_compr_stream *cstream,
                                 char __user *buf, size_t count);
 int snd_soc_component_compr_set_metadata(struct snd_compr_stream *cstream,
                                         struct snd_compr_metadata *metadata);
+int snd_soc_component_compr_get_metadata(struct snd_compr_stream *cstream,
+                                        struct snd_compr_metadata *metadata);
 
 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 ef2b976..5d3a8dc 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -656,6 +656,26 @@ int snd_soc_component_compr_set_metadata(struct snd_compr_stream *cstream,
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_set_metadata);
 
+int snd_soc_component_compr_get_metadata(struct snd_compr_stream *cstream,
+                                        struct snd_compr_metadata *metadata)
+{
+       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->get_metadata) {
+                       ret = component->driver->compress_ops->get_metadata(
+                               component, cstream, metadata);
+                       return soc_component_ret(component, ret);
+               }
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_metadata);
+
 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 3d29b41..5a751d5 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -464,24 +464,14 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
                                  struct snd_compr_metadata *metadata)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
-       struct snd_soc_component *component;
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
-       int i, ret;
+       int ret;
 
        ret = snd_soc_dai_compr_get_metadata(cpu_dai, cstream, metadata);
        if (ret < 0)
                return ret;
 
-       for_each_rtd_components(rtd, i, component) {
-               if (!component->driver->compress_ops ||
-                   !component->driver->compress_ops->get_metadata)
-                       continue;
-
-               return component->driver->compress_ops->get_metadata(
-                       component, cstream, metadata);
-       }
-
-       return 0;
+       return snd_soc_component_compr_get_metadata(cstream, metadata);
 }
 
 /* ASoC Compress operations */