ASoC: soc-dai: add snd_soc_dai_compr_trigger()

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

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/87mu71ssiz.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 abf4ad25ce68a64e5fa805c87b8d2904125df1f1..ae04575ed8bc441b386b4d3be1693a3f44a1ca41 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -174,6 +174,8 @@ int snd_soc_dai_compr_startup(struct snd_soc_dai *dai,
                              struct snd_compr_stream *cstream);
 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);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index af74fb7959b94ce8ba9e8f7abfc3d598bd2e94a4..b05305a4d86ceb50e2d98fe80e3eacb1571f4787 100644 (file)
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -338,8 +338,9 @@ static int soc_compr_trigger(struct snd_compr_stream *cstream, int cmd)
        if (ret < 0)
                goto out;
 
-       if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger)
-               cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);
+       ret = snd_soc_dai_compr_trigger(cpu_dai, cstream, cmd);
+       if (ret < 0)
+               goto out;
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
@@ -372,11 +373,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 
        mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
-       if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
-               ret = cpu_dai->driver->cops->trigger(cstream, cmd, cpu_dai);
-               if (ret < 0)
-                       goto out;
-       }
+       ret = snd_soc_dai_compr_trigger(cpu_dai, cstream, cmd);
+       if (ret < 0)
+               goto out;
 
        ret = soc_compr_components_trigger(cstream, cmd);
        if (ret < 0)

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index d5cb8b0853a78169b8ed1c6d3a138d6ac2b0effc..844b5252817443ef8e243b2730bb1ea1ce68b497 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -526,3 +526,16 @@ void snd_soc_dai_compr_shutdown(struct snd_soc_dai *dai,
                dai->driver->cops->shutdown(cstream, dai);
 }
 EXPORT_SYMBOL_GPL(snd_soc_dai_compr_shutdown);
+
+int snd_soc_dai_compr_trigger(struct snd_soc_dai *dai,
+                             struct snd_compr_stream *cstream, int cmd)
+{
+       int ret = 0;
+
+       if (dai->driver->cops &&
+           dai->driver->cops->trigger)
+               ret = dai->driver->cops->trigger(cstream, cmd, dai);
+
+       return soc_dai_ret(dai, ret);
+}
+EXPORT_SYMBOL_GPL(snd_soc_dai_compr_trigger);