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

ASoC: soc-dai: add snd_soc_dai_suspend()



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

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


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

parent 1dea80d4

include/sound/soc-dai.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ 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);

		struct snd_soc_dai_ops {
		/*

sound/soc/soc-core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -511,8 +511,8 @@ int snd_soc_suspend(struct device *dev)
		if (rtd->dai_link->ignore_suspend)
		continue;

		if (cpu_dai->driver->suspend && !cpu_dai->driver->bus_control)
		cpu_dai->driver->suspend(cpu_dai);
		if (!cpu_dai->driver->bus_control)
		snd_soc_dai_suspend(cpu_dai);
		}

		/* close any waiting streams */
		@@ -584,8 +584,8 @@ int snd_soc_suspend(struct device *dev)
		if (rtd->dai_link->ignore_suspend)
		continue;

		if (cpu_dai->driver->suspend && cpu_dai->driver->bus_control)
		cpu_dai->driver->suspend(cpu_dai);
		if (cpu_dai->driver->bus_control)
		snd_soc_dai_suspend(cpu_dai);

		/* deactivate pins to sleep state */
		pinctrl_pm_select_sleep_state(cpu_dai->dev);

sound/soc/soc-dai.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -353,3 +353,9 @@ snd_pcm_sframes_t snd_soc_dai_delay(struct snd_soc_dai *dai,

		return delay;
		}

		void snd_soc_dai_suspend(struct snd_soc_dai *dai)
		{
		if (dai->driver->suspend)
		dai->driver->suspend(dai);
		}