ASoC: soc-component: add snd_soc_component_compr_get_codec_caps()

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

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/877dqp7v6i.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 7fd45462963e4d76d99f8002be56e7c436c9261d..d91e0eb1546d520aa3343c841b9f8e12e63833f6 100644 (file)
--- a/include/sound/soc-component.h
+++ b/include/sound/soc-component.h
@@ -455,6 +455,8 @@ int snd_soc_component_compr_get_params(struct snd_compr_stream *cstream,
                                       struct snd_codec *params);
 int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
                                     struct snd_compr_caps *caps);
+int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                                          struct snd_compr_codec_caps *codec);
 
 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 b885e96cc8aedaf875e0525cfcdc9b01bfb10db2..8fba1a395f1e1cf15b319c41376d2457492228a6 100644 (file)
--- a/sound/soc/soc-component.c
+++ b/sound/soc/soc-component.c
@@ -547,6 +547,30 @@ int snd_soc_component_compr_get_caps(struct snd_compr_stream *cstream,
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_caps);
 
+int snd_soc_component_compr_get_codec_caps(struct snd_compr_stream *cstream,
+                                          struct snd_compr_codec_caps *codec)
+{
+       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->get_codec_caps) {
+                       ret = component->driver->compress_ops->get_codec_caps(
+                               component, cstream, codec);
+                       break;
+               }
+       }
+
+       mutex_unlock(&rtd->card->pcm_mutex);
+
+       return soc_component_ret(component, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_component_compr_get_codec_caps);
+
 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 e7530712ab91de22a465018fc87a3c35e0e8b551..a82bd02d5519b01a5092662f9b09796c7a0c2a12 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -409,29 +409,6 @@ err:
        return ret;
 }
 
-static int soc_compr_get_codec_caps(struct snd_compr_stream *cstream,
-                                   struct snd_compr_codec_caps *codec)
-{
-       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->get_codec_caps)
-                       continue;
-
-               ret = component->driver->compress_ops->get_codec_caps(
-                       component, cstream, codec);
-               break;
-       }
-
-       mutex_unlock(&rtd->card->pcm_mutex);
-       return ret;
-}
-
 static int soc_compr_ack(struct snd_compr_stream *cstream, size_t bytes)
 {
        struct snd_soc_pcm_runtime *rtd = cstream->private_data;
@@ -574,7 +551,7 @@ static struct snd_compr_ops soc_compr_ops = {
        .pointer        = soc_compr_pointer,
        .ack            = soc_compr_ack,
        .get_caps       = snd_soc_component_compr_get_caps,
-       .get_codec_caps = soc_compr_get_codec_caps
+       .get_codec_caps = snd_soc_component_compr_get_codec_caps,
 };
 
 /* ASoC Dynamic Compress operations */
@@ -589,7 +566,7 @@ static struct snd_compr_ops soc_compr_dyn_ops = {
        .pointer        = soc_compr_pointer,
        .ack            = soc_compr_ack,
        .get_caps       = snd_soc_component_compr_get_caps,
-       .get_codec_caps = soc_compr_get_codec_caps
+       .get_codec_caps = snd_soc_component_compr_get_codec_caps,
 };
 
 /**