Unverified Commit 24b09d05 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dai: add snd_soc_dai_resume() 



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_resume() and use it.

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


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent e0f22622

include/sound/soc-dai.h

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ int snd_soc_dai_bespoke_trigger(struct snd_soc_dai *dai, 
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);

void snd_soc_dai_resume(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
@@ -631,8 +631,8 @@ static void soc_resume_deferred(struct work_struct *work) 
		if (rtd->dai_link->ignore_suspend)

			continue;



		if (cpu_dai->driver->resume && cpu_dai->driver->bus_control)

			cpu_dai->driver->resume(cpu_dai);

		if (cpu_dai->driver->bus_control)

			snd_soc_dai_resume(cpu_dai);

	}



	for_each_card_components(card, component) {
@@ -678,8 +678,8 @@ static void soc_resume_deferred(struct work_struct *work) 
		if (rtd->dai_link->ignore_suspend)

			continue;



		if (cpu_dai->driver->resume && !cpu_dai->driver->bus_control)

			cpu_dai->driver->resume(cpu_dai);

		if (!cpu_dai->driver->bus_control)

			snd_soc_dai_resume(cpu_dai);

	}



	if (card->resume_post)

sound/soc/soc-dai.c

+6 −0
Original line number Diff line number Diff line
@@ -359,3 +359,9 @@ void snd_soc_dai_suspend(struct snd_soc_dai *dai) 
	if (dai->driver->suspend)

		dai->driver->suspend(dai);

}



void snd_soc_dai_resume(struct snd_soc_dai *dai)

{

	if (dai->driver->resume)

		dai->driver->resume(dai);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE