From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux-ALSA <alsa-devel@alsa-project.org>
Subject: [PATCH v2 06/17] ASoC: soc-dai: add snd_soc_pcm_dai_bespoke_trigger()
Date: 24 Apr 2020 08:15:09 +0900 [thread overview]
Message-ID: <87tv19ssjm.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <87368tu75n.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
v1 -> v2
- no change
include/sound/soc-dai.h | 4 ++--
sound/soc/soc-dai.c | 33 ++++++++++++++++++++-------------
sound/soc/soc-pcm.c | 21 +++------------------
3 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 3da850b4aefe..a0c7ac112b86 100644
--- 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 29587d7e75ca..226c51b9089c 100644
--- 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 e56500212c0c..440c7e87829a 100644
--- 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;
--
2.17.1
next prev parent reply other threads:[~2020-04-23 23:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-23 23:14 [PATCH v2 00/17] ASoC: soc-dai: add snd_soc_dai_xxx() Kuninori Morimoto
2020-04-23 23:14 ` [PATCH v2 01/17] ASoC: soc-dai: add soc_dai_err() Kuninori Morimoto
2020-04-23 23:14 ` [PATCH v2 02/17] ASoC: soc-dai: don't overwide dai->driver->ops Kuninori Morimoto
2020-04-23 23:14 ` [PATCH v2 03/17] ASoC: soc-dai: add snd_soc_pcm_dai_new() Kuninori Morimoto
2020-04-23 23:14 ` [PATCH v2 04/17] ASoC: soc-dai: add snd_soc_pcm_dai_prepare() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 05/17] ASoC: soc-dai: add snd_soc_pcm_dai_trigger() Kuninori Morimoto
2020-04-23 23:15 ` Kuninori Morimoto [this message]
2020-04-23 23:15 ` [PATCH v2 07/17] ASoC: soc-dai: add snd_soc_pcm_dai_probe() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 08/17] ASoC: soc-dai: add snd_soc_pcm_dai_remove() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 09/17] ASoC: soc-dai: add snd_soc_dai_compr_start() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 10/17] ASoC: soc-dai: add snd_soc_dai_compr_shutdown() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 11/17] ASoC: soc-dai: add snd_soc_dai_compr_trigger() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 12/17] ASoC: soc-dai: add snd_soc_dai_compr_set_params() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 13/17] ASoC: soc-dai: add snd_soc_dai_compr_get_params() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 14/17] ASoC: soc-dai: add snd_soc_dai_compr_ack() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 15/17] ASoC: soc-dai: add snd_soc_dai_compr_pointer() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 16/17] ASoC: soc-dai: add snd_soc_dai_compr_set_metadata() Kuninori Morimoto
2020-04-23 23:15 ` [PATCH v2 17/17] ASoC: soc-dai: add snd_soc_dai_compr_get_metadata() Kuninori Morimoto
2020-04-24 2:28 ` [PATCH v2 00/17] ASoC: soc-dai: add snd_soc_dai_xxx() Ranjani Sridharan
2020-04-29 16:26 ` Mark Brown
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=87tv19ssjm.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).