ASoC: soc-dai: add snd_soc_pcm_dai_bespoke_trigger()

We have 2 type of component functions
snd_soc_dai_xxx()     is focusing to dai itself,
snd_soc_pcm_dai_xxx() is focusing to rtd related dai.

Now we can update soc_pcm_bespoke_trigger() to
snd_soc_pcm_dai_bespoke_trigger(). This patch do it.

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/87tv19ssjm.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 3da850b4aefed173a14076af1a4d6780eeb65413..a0c7ac112b86bb8dbc901a0f7436089ad46eb5b8 100644 (file)
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -154,8 +154,6 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
                        struct snd_pcm_substream *substream);
 void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
                          struct snd_pcm_substream *substream);
-int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
-                       struct snd_pcm_substream *substream, int cmd);
 snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
                                    struct snd_pcm_substream *substream);
 void snd_soc_dai_suspend(struct snd_soc_dai *dai);
@@ -169,6 +167,8 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream);
 int snd_soc_pcm_dai_new(struct snd_soc_pcm_runtime *rtd);
 int snd_soc_pcm_dai_prepare(struct snd_pcm_substream *substream);
 int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream, int cmd);
+int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream,
+                                   int cmd);
 
 struct snd_soc_dai_ops {
        /*

diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c
index 29587d7e75cabc73bcbd3db5918ced6c35e699d3..226c51b9089c217cc33fdccddfafaf1bbdca09a2 100644 (file)
--- a/sound/soc/soc-dai.c
+++ b/sound/soc/soc-dai.c
@@ -354,19 +354,6 @@ void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
                dai->driver->ops->shutdown(substream, dai);
 }
 
-int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,
-                               struct snd_pcm_substream *substream,
-                               int cmd)
-{
-       int ret = 0;
-
-       if (dai->driver->ops &&
-           dai->driver->ops->bespoke_trigger)
-               ret = dai->driver->ops->bespoke_trigger(substream, cmd, dai);
-
-       return soc_dai_ret(dai, ret);
-}
-
 snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
                                    struct snd_pcm_substream *substream)
 {
@@ -473,3 +460,23 @@ int snd_soc_pcm_dai_trigger(struct snd_pcm_substream *substream,
 
        return 0;
 }
+
+int snd_soc_pcm_dai_bespoke_trigger(struct snd_pcm_substream *substream,
+                                   int cmd)
+{
+       struct snd_soc_pcm_runtime *rtd = substream->private_data;
+       struct snd_soc_dai *dai;
+       int i, ret;
+
+       for_each_rtd_dais(rtd, i, dai) {
+               if (dai->driver->ops &&
+                   dai->driver->ops->bespoke_trigger) {
+                       ret = dai->driver->ops->bespoke_trigger(substream,
+                                                               cmd, dai);
+                       if (ret < 0)
+                               return soc_dai_ret(dai, ret);
+               }
+       }
+
+       return 0;
+}

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index e56500212c0c1fbe003c98eb2db67402917949f1..440c7e87829ac1112341ee5c6f46f4e65b74cbe2 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1252,21 +1252,6 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
        return ret;
 }
 
-static int soc_pcm_bespoke_trigger(struct snd_pcm_substream *substream,
-                                  int cmd)
-{
-       struct snd_soc_pcm_runtime *rtd = substream->private_data;
-       struct snd_soc_dai *dai;
-       int i, ret;
-
-       for_each_rtd_dais(rtd, i, dai) {
-               ret = snd_soc_dai_bespoke_trigger(dai, substream, cmd);
-               if (ret < 0)
-                       return ret;
-       }
-
-       return 0;
-}
 /*
  * soc level wrapper for pointer callback
  * If cpu_dai, codec_dai, component driver has the delay callback, then
@@ -2470,7 +2455,7 @@ static int dpcm_fe_dai_do_trigger(struct snd_pcm_substream *substream, int cmd)
                dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd %d\n",
                                fe->dai_link->name, cmd);
 
-               ret = soc_pcm_bespoke_trigger(substream, cmd);
+               ret = snd_soc_pcm_dai_bespoke_trigger(substream, cmd);
                break;
        default:
                dev_err(fe->dev, "ASoC: invalid trigger cmd %d for %s\n", cmd,
@@ -2615,7 +2600,7 @@ static int dpcm_run_update_shutdown(struct snd_soc_pcm_runtime *fe, int stream)
                dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd stop\n",
                                fe->dai_link->name);
 
-               err = soc_pcm_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_STOP);
+               err = snd_soc_pcm_dai_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_STOP);
                if (err < 0)
                        dev_err(fe->dev,"ASoC: trigger FE failed %d\n", err);
        } else {
@@ -2693,7 +2678,7 @@ static int dpcm_run_update_startup(struct snd_soc_pcm_runtime *fe, int stream)
                dev_dbg(fe->dev, "ASoC: bespoke trigger FE %s cmd start\n",
                                fe->dai_link->name);
 
-               ret = soc_pcm_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_START);
+               ret = snd_soc_pcm_dai_bespoke_trigger(substream, SNDRV_PCM_TRIGGER_START);
                if (ret < 0) {
                        dev_err(fe->dev,"ASoC: bespoke trigger FE failed %d\n", ret);
                        goto hw_free;