Unverified Commit 330fcb51 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: soc-dai: add snd_soc_dai_shutdown() 



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

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


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

include/sound/soc-dai.h

+2 −0
Original line number Diff line number Diff line
@@ -152,6 +152,8 @@ void snd_soc_dai_hw_free(struct snd_soc_dai *dai, 
			 struct snd_pcm_substream *substream);

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);



struct snd_soc_dai_ops {

	/*

sound/soc/soc-dai.c

+7 −0
Original line number Diff line number Diff line
@@ -300,3 +300,10 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai, 


	return ret;

}



void snd_soc_dai_shutdown(struct snd_soc_dai *dai,

			 struct snd_pcm_substream *substream)

{

	if (dai->driver->ops->shutdown)

		dai->driver->ops->shutdown(substream, dai);

}

sound/soc/soc-dapm.c

+2 −5
Original line number Diff line number Diff line
@@ -3893,9 +3893,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
			snd_soc_dai_hw_free(source, &substream);



			source->active--;

			if (source->driver->ops->shutdown)

				source->driver->ops->shutdown(&substream,

							      source);

			snd_soc_dai_shutdown(source, &substream);

		}



		substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
@@ -3905,8 +3903,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w, 
			snd_soc_dai_hw_free(sink, &substream);



			sink->active--;

			if (sink->driver->ops->shutdown)

				sink->driver->ops->shutdown(&substream, sink);

			snd_soc_dai_shutdown(sink, &substream);

		}

		break;

sound/soc/soc-pcm.c

+6 −12
Original line number Diff line number Diff line
@@ -641,16 +641,13 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 
	i = rtd->num_codecs;



codec_dai_err:

	for_each_rtd_codec_dai_rollback(rtd, i, codec_dai) {

		if (codec_dai->driver->ops->shutdown)

			codec_dai->driver->ops->shutdown(substream, codec_dai);

	}

	for_each_rtd_codec_dai_rollback(rtd, i, codec_dai)

		snd_soc_dai_shutdown(codec_dai, substream);



component_err:

	soc_pcm_components_close(substream, component);



	if (cpu_dai->driver->ops->shutdown)

		cpu_dai->driver->ops->shutdown(substream, cpu_dai);

	snd_soc_dai_shutdown(cpu_dai, substream);

out:

	mutex_unlock(&rtd->pcm_mutex);
@@ -728,13 +725,10 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) 


	snd_soc_dai_digital_mute(cpu_dai, 1, substream->stream);



	if (cpu_dai->driver->ops->shutdown)

		cpu_dai->driver->ops->shutdown(substream, cpu_dai);

	snd_soc_dai_shutdown(cpu_dai, substream);



	for_each_rtd_codec_dai(rtd, i, codec_dai) {

		if (codec_dai->driver->ops->shutdown)

			codec_dai->driver->ops->shutdown(substream, codec_dai);

	}

	for_each_rtd_codec_dai(rtd, i, codec_dai)

		snd_soc_dai_shutdown(codec_dai, substream);



	if (rtd->dai_link->ops->shutdown)

		rtd->dai_link->ops->shutdown(substream);