ASoC: soc-dai: add snd_soc_dai_compr_get_metadata()

dai related function should be implemented at soc-dai.c.
This patch adds snd_soc_dai_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/87eesdssi8.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index d21a2a33b7bcff5c5ed16288c2022219dc918418..2a0a5af1c1ae7eb6b9a0582d6bbf9de4c6311978 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -191,6 +191,9 @@ int snd_soc_dai_compr_pointer(struct snd_soc_dai *dai,
 int snd_soc_dai_compr_set_metadata(struct snd_soc_dai *dai,
                                   struct snd_compr_stream *cstream,
                                   struct snd_compr_metadata *metadata);
+int snd_soc_dai_compr_get_metadata(struct snd_soc_dai *dai,
+                                  struct snd_compr_stream *cstream,
+                                  struct snd_compr_metadata *metadata);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 7dd790c6f48fcc40335cf8f420bd66caa803cc0f..def3ae78b4a7de817991a8a8b967da6ae0c6b39e 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -723,11 +723,9 @@ static int soc_compr_get_metadata(struct snd_compr_stream *cstream,
        struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
        int i, ret;
 
-       if (cpu_dai->driver->cops && cpu_dai->driver->cops->get_metadata) {
-               ret = cpu_dai->driver->cops->get_metadata(cstream, metadata, cpu_dai);
-               if (ret < 0)
-                       return 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 ||

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 88990792fe4984d75cbc499ad5a928d7fe9de7a5..8e5fe012aa1d054b1727599bff690a879a5011cb 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -609,3 +609,17 @@ int snd_soc_dai_compr_set_metadata(struct snd_soc_dai *dai,
        return soc_dai_ret(dai, ret);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_compr_set_metadata);
+
+int snd_soc_dai_compr_get_metadata(struct snd_soc_dai *dai,
+                                  struct snd_compr_stream *cstream,
+                                  struct snd_compr_metadata *metadata)
+{
+       int ret = 0;
+
+       if (dai->driver->cops &&
+           dai->driver->cops->get_metadata)
+               ret = dai->driver->cops->get_metadata(cstream, metadata, dai);
+
+       return soc_dai_ret(dai, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_compr_get_metadata);