ASoC: soc-dai: add snd_soc_dai_compr_set_params()

dai related function should be implemented at soc-dai.c.
This patch adds snd_soc_dai_compr_set_params().

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/87lfmlssiv.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 ae04575..1a2ef30 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -176,6 +176,9 @@ void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,
                                struct snd_compr_stream *cstream);
 int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,
                              struct snd_compr_stream *cstream, int cmd);
+int snd_soc_dai_compr_set_params(struct snd_soc_dai *dai,
+                                struct snd_compr_stream *cstream,
+                                struct snd_compr_params *params);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index b05305a..13b5c7a 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -443,11 +443,9 @@ static int soc_compr_set_params(struct snd_compr_stream *cstream,
         * that these callbacks will configure everything for this compress
         * path, like configuring a PCM port for a CODEC.
         */
-       if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_params) {
-               ret = cpu_dai->driver->cops->set_params(cstream, params, cpu_dai);
-               if (ret < 0)
-                       goto err;
-       }
+       ret = snd_soc_dai_compr_set_params(cpu_dai, cstream, params);
+       if (ret < 0)
+               goto err;
 
        ret = soc_compr_components_set_params(cstream, params);
        if (ret < 0)
@@ -513,11 +511,9 @@ static int soc_compr_set_params_fe(struct snd_compr_stream *cstream,
        if (ret < 0)
                goto out;
 
-       if (cpu_dai->driver->cops && cpu_dai->driver->cops->set_params) {
-               ret = cpu_dai->driver->cops->set_params(cstream, params, cpu_dai);
-               if (ret < 0)
-                       goto out;
-       }
+       ret = snd_soc_dai_compr_set_params(cpu_dai, cstream, params);
+       if (ret < 0)
+               goto out;
 
        ret = soc_compr_components_set_params(cstream, params);
        if (ret < 0)

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 844b525..44e754f 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -539,3 +539,17 @@ int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,
        return soc_dai_ret(dai, ret);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_compr_trigger);
+
+int snd_soc_dai_compr_set_params(struct snd_soc_dai *dai,
+                                struct snd_compr_stream *cstream,
+                                struct snd_compr_params *params)
+{
+       int ret = 0;
+
+       if (dai->driver->cops &&
+           dai->driver->cops->set_params)
+               ret = dai->driver->cops->set_params(cstream, params, dai);
+
+       return soc_dai_ret(dai, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_compr_set_params);