ASoC: soc-component: merge soc_pcm_trigger_start/stop()

Now, soc_pcm_trigger_start/stop() are simple enough.
Let's merge these into soc_pcm_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/87ftbbw8wj.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index be5c83f1ab0c2691a5310a843a869c72f2f7f126..9be6c282d80e5cdd6f661d47665eadd8d7e0672b 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1072,57 +1072,37 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)
        return 0;
 }
 
-static int soc_pcm_trigger_start(struct snd_pcm_substream *substream, int cmd)
-{
-       int ret;
-
-       ret = snd_soc_link_trigger(substream, cmd);
-       if (ret < 0)
-               return ret;
-
-       ret = snd_soc_pcm_component_trigger(substream, cmd);
-       if (ret < 0)
-               return ret;
-
-       return snd_soc_pcm_dai_trigger(substream, cmd);
-}
-
-static int soc_pcm_trigger_stop(struct snd_pcm_substream *substream, int cmd)
-{
-       int ret;
-
-       ret = snd_soc_pcm_dai_trigger(substream, cmd);
-       if (ret < 0)
-               return ret;
-
-       ret = snd_soc_pcm_component_trigger(substream, cmd);
-       if (ret < 0)
-               return ret;
-
-       ret = snd_soc_link_trigger(substream, cmd);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
-
 static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
 {
-       int ret;
+       int ret = -EINVAL;
 
        switch (cmd) {
        case SNDRV_PCM_TRIGGER_START:
        case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
-               ret = soc_pcm_trigger_start(substream, cmd);
+               ret = snd_soc_link_trigger(substream, cmd);
+               if (ret < 0)
+                       break;
+
+               ret = snd_soc_pcm_component_trigger(substream, cmd);
+               if (ret < 0)
+                       break;
+
+               ret = snd_soc_pcm_dai_trigger(substream, cmd);
                break;
        case SNDRV_PCM_TRIGGER_STOP:
        case SNDRV_PCM_TRIGGER_SUSPEND:
        case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
-               ret = soc_pcm_trigger_stop(substream, cmd);
+               ret = snd_soc_pcm_dai_trigger(substream, cmd);
+               if (ret < 0)
+                       break;
+
+               ret = snd_soc_pcm_component_trigger(substream, cmd);
+               if (ret < 0)
+                       break;
+
+               ret = snd_soc_link_trigger(substream, cmd);
                break;
-       default:
-               return -EINVAL;
        }
 
        return ret;