From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
To: Mark Brown <broonie@kernel.org>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Jie Yang <yang.jie@linux.intel.com>,
Linux-ALSA <alsa-devel@alsa-project.org>,
Takashi Iwai <tiwai@suse.com>,
Hans de Goede <hdegoede@redhat.com>,
Gu Shengxian <gushengxian@yulong.com>
Subject: [PATCH 5/5] ASoC: soc-pcm: tidyup soc_pcm_pointer()'s delay update method
Date: 16 Nov 2021 16:45:34 +0900 [thread overview]
Message-ID: <87zgq4wnkx.wl-kuninori.morimoto.gx@renesas.com> (raw)
In-Reply-To: <877dd8y26l.wl-kuninori.morimoto.gx@renesas.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
No driver directly updates runtime->delay in .pointer.
This patch cleanups its method.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/soc-pcm.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 3aba9480cb0b..7fbb59c61a7d 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1080,29 +1080,22 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
/*
* soc level wrapper for pointer callback
* If cpu_dai, codec_dai, component driver has the delay callback, then
- * the runtime->delay will be updated accordingly.
+ * the runtime->delay will be updated via snd_soc_pcm_component/dai_delay().
*/
static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_uframes_t offset = 0;
- snd_pcm_sframes_t delay = 0;
snd_pcm_sframes_t codec_delay = 0;
snd_pcm_sframes_t cpu_delay = 0;
- /* clearing the previous total delay */
- runtime->delay = 0;
-
offset = snd_soc_pcm_component_pointer(substream);
- /* base delay if assigned in pointer callback */
- delay = runtime->delay;
-
/* should be called *after* snd_soc_pcm_component_pointer() */
snd_soc_pcm_dai_delay(substream, &cpu_delay, &codec_delay);
snd_soc_pcm_component_delay(substream, &cpu_delay, &codec_delay);
- runtime->delay = delay + cpu_delay + codec_delay;
+ runtime->delay = cpu_delay + codec_delay;
return offset;
}
--
2.25.1
next prev parent reply other threads:[~2021-11-16 7:47 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 7:44 [PATCH 0/5] ASoC: soc-pcm: tidyup soc_pcm_pointer()'s delay update method Kuninori Morimoto
2021-11-16 7:45 ` [PATCH 1/5] ASoC: soc-dai: update snd_soc_dai_delay() to snd_soc_pcm_dai_delay() Kuninori Morimoto
2021-11-16 20:43 ` Pierre-Louis Bossart
2021-11-25 16:39 ` Mark Brown
2021-11-25 23:41 ` Kuninori Morimoto
2021-11-26 14:09 ` Mark Brown
2021-11-29 15:42 ` Pierre-Louis Bossart
2021-11-16 7:45 ` [PATCH 2/5] ASoC: soc-component: add snd_soc_pcm_component_delay() Kuninori Morimoto
2021-11-16 7:45 ` [PATCH 3/5] ASoC: amd: acp-pcm-dma: add .delay support Kuninori Morimoto
2021-11-16 7:45 ` [PATCH 4/5] ASoC: intel: sst-mfld-platform-pcm: " Kuninori Morimoto
2021-11-16 7:45 ` Kuninori Morimoto [this message]
2021-11-29 15:43 ` [PATCH 0/5] ASoC: soc-pcm: tidyup soc_pcm_pointer()'s delay update method Pierre-Louis Bossart
2021-11-29 16:45 ` 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=87zgq4wnkx.wl-kuninori.morimoto.gx@renesas.com \
--to=kuninori.morimoto.gx@renesas.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=gushengxian@yulong.com \
--cc=hdegoede@redhat.com \
--cc=lgirdwood@gmail.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=tiwai@suse.com \
--cc=yang.jie@linux.intel.com \
/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).