From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH 23/24] ASoC: soc-component: merge soc_pcm_trigger_start/stop()
Date: 01 Jun 2020 10:37:38 +0900 [thread overview]
Message-ID: <87d06jy3a5.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87a71nzhy2.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
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 a68c9b0f2b8a..e36d6eec19e8 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1075,57 +1075,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.17.1
next prev parent reply other threads:[~2020-06-01 1:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 1:35 [PATCH 00/24] ASoC: soc-component: collect component functions Kuninori Morimoto
2020-06-01 1:35 ` [PATCH 01/24] ASoC: soc-component: add soc_component_pin() and share code Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 02/24] ASoC: soc-component: move snd_soc_component_xxx_regmap() to soc-component Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 03/24] ASoC: soc-component: move snd_soc_component_initialize() to soc-component.c Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 04/24] ASoC: soc-component: add soc_component_err() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 05/24] ASoC: soc-component: add snd_soc_pcm_component_prepare() Kuninori Morimoto
2020-06-01 18:22 ` Ranjani Sridharan
2020-06-01 23:12 ` Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 06/24] ASoC: soc-component: add snd_soc_pcm_component_hw_params() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 07/24] ASoC: soc-component: add snd_soc_pcm_component_hw_free() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 08/24] ASoC: soc-component: add snd_soc_pcm_component_trigger() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 09/24] ASoC: soc-component: add snd_soc_component_compr_open() Kuninori Morimoto
2020-06-01 19:01 ` Ranjani Sridharan
2020-06-01 23:16 ` Kuninori Morimoto
2020-06-03 10:40 ` Mark Brown
2020-06-04 0:52 ` Kuninori Morimoto
2020-06-04 4:23 ` Kuninori Morimoto
2020-06-03 16:55 ` Ranjani Sridharan
2020-06-01 1:36 ` [PATCH 10/24] ASoC: soc-component: add snd_soc_component_compr_free() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 11/24] ASoC: soc-component: add snd_soc_component_compr_trigger() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 12/24] ASoC: soc-component: add snd_soc_component_compr_set_params() Kuninori Morimoto
2020-06-01 1:36 ` [PATCH 13/24] ASoC: soc-component: add snd_soc_component_compr_get_params() Kuninori Morimoto
2020-06-01 1:37 ` [PATCH 14/24] ASoC: soc-component: add snd_soc_component_compr_get_caps() Kuninori Morimoto
2020-06-01 1:37 ` [PATCH 15/24] ASoC: soc-component: add snd_soc_component_compr_get_codec_caps() Kuninori Morimoto
2020-06-01 1:37 ` [PATCH 16/24] ASoC: soc-component: add snd_soc_component_compr_ack() Kuninori Morimoto
2020-06-01 1:37 ` [PATCH 17/24] ASoC: soc-component: add snd_soc_component_compr_pointer() Kuninori Morimoto
2020-06-03 17:35 ` Ranjani Sridharan
2020-06-01 1:37 ` [PATCH 18/24] ASoC: soc-component: add snd_soc_component_compr_copy() Kuninori Morimoto
2020-06-03 17:39 ` Ranjani Sridharan
2020-06-01 1:37 ` [PATCH 19/24] ASoC: soc-component: add snd_soc_component_compr_set_metadata() Kuninori Morimoto
2020-06-03 17:40 ` Ranjani Sridharan
2020-06-01 1:37 ` [PATCH 20/24] ASoC: soc-component: add snd_soc_component_compr_get_metadata() Kuninori Morimoto
2020-06-03 17:41 ` Ranjani Sridharan
2020-06-01 1:37 ` [PATCH 21/24] ASoC: soc-component: add snd_soc_component_init() Kuninori Morimoto
2020-06-01 1:37 ` [PATCH 22/24] ASoC: soc-component: merge soc-io.c into soc-component.c Kuninori Morimoto
2020-06-01 1:37 ` Kuninori Morimoto [this message]
2020-06-01 1:37 ` [PATCH 24/24] ASoC: soc-component: tidyup Copyright Kuninori Morimoto
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87d06jy3a5.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.