Unverified Commit 1dea80d4 authored Jul 22, 2019 by Kuninori Morimoto Committed by Mark Brown Jul 23, 2019

ASoC: soc-dai: add snd_soc_dai_delay()



Current ALSA SoC is directly using dai->driver->ops->xxx,
thus, it has deep nested bracket, and it makes code unreadable.
This patch adds new snd_soc_dai_delay() and use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87o91mhn3i.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 5c0769af

include/sound/soc-dai.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -160,6 +160,8 @@ int snd_soc_dai_trigger(struct snd_soc_dai *dai,
		struct snd_pcm_substream *substream, int cmd);
		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);

		struct snd_soc_dai_ops {
		/*

sound/soc/soc-dai.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -342,3 +342,14 @@ int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai,

		return ret;
		}

		snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,
		struct snd_pcm_substream *substream)
		{
		int delay = 0;

		if (dai->driver->ops->delay)
		delay = dai->driver->ops->delay(substream, dai);

		return delay;
		}

sound/soc/soc-pcm.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -1169,14 +1169,11 @@ static snd_pcm_uframes_t soc_pcm_pointer(struct snd_pcm_substream *substream)
		/* base delay if assigned in pointer callback */
		delay = runtime->delay;

		if (cpu_dai->driver->ops->delay)
		delay += cpu_dai->driver->ops->delay(substream, cpu_dai);
		delay += snd_soc_dai_delay(cpu_dai, substream);

		for_each_rtd_codec_dai(rtd, i, codec_dai) {
		if (codec_dai->driver->ops->delay)
		codec_delay = max(codec_delay,
		codec_dai->driver->ops->delay(substream,
		codec_dai));
		snd_soc_dai_delay(codec_dai, substream));
		}
		delay += codec_delay;