From 836367be289d5b130769fd7c46172557e614a148 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Date: Thu, 4 Jun 2020 17:08:12 +0900
Subject: [PATCH] ASoC: soc-component: merge soc_pcm_trigger_start/stop()
Git-commit: 836367be289d5b130769fd7c46172557e614a148
Patch-mainline: v5.9-rc1
References: jsc#SLE-16518
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>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/soc-pcm.c | 58 ++++++++++++++++++-----------------------------------
1 file changed, 19 insertions(+), 39 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index be5c83f1ab0c..9be6c282d80e 100644
--- 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;
--
2.16.4