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

ASoC: soc-pcm: check DAI activity under soc_pcm_apply_symmetry() 



soc_pcm_apply_symmetry() is used like below in all cases.

	if (snd_soc_dai_active(dai)) {
		err = soc_pcm_apply_symmetry(fe_substream, dai);
		...
	}

Because of this style, the code is deep nested.
This patch checks it under soc_pcm_apply_symmetry(), and makes code simple.

	static int soc_pcm_apply_symmetry(...)
	{
		...
=>		if (!snd_soc_dai_active(...))
			return 0;
		...
	}

=>	ret = soc_pcm_apply_symmetry();
	if (ret < 0)
		...

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


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

sound/soc/soc-pcm.c

+12 −15
Original line number Diff line number Diff line
@@ -349,6 +349,9 @@ static int soc_pcm_apply_symmetry(struct snd_pcm_substream *substream, 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	int ret;



	if (!snd_soc_dai_active(soc_dai))

		return 0;



#define __soc_pcm_apply_symmetry(name, NAME)				\

	if (soc_dai->name && (soc_dai->driver->symmetric_##name ||	\

			      rtd->dai_link->symmetric_##name)) {	\
@@ -765,12 +768,10 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) 


	/* Symmetry only applies if we've already got an active stream. */

	for_each_rtd_dais(rtd, i, dai) {

		if (snd_soc_dai_active(dai)) {

		ret = soc_pcm_apply_symmetry(substream, dai);

		if (ret != 0)

			goto err;

	}

	}



	pr_debug("ASoC: %s <-> %s info:\n",

		 codec_dai_name, cpu_dai_name);
@@ -1693,12 +1694,10 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, 


	for_each_rtd_cpu_dais (fe, i, fe_cpu_dai) {

		/* Symmetry only applies if we've got an active stream. */

		if (snd_soc_dai_active(fe_cpu_dai)) {

		err = soc_pcm_apply_symmetry(fe_substream, fe_cpu_dai);

		if (err < 0)

			return err;

	}

	}



	/* apply symmetry for BE */

	for_each_dpcm_be(fe, stream, dpcm) {
@@ -1721,13 +1720,11 @@ static int dpcm_apply_symmetry(struct snd_pcm_substream *fe_substream, 


		/* Symmetry only applies if we've got an active stream. */

		for_each_rtd_dais(rtd, i, dai) {

			if (snd_soc_dai_active(dai)) {

			err = soc_pcm_apply_symmetry(fe_substream, dai);

			if (err < 0)

				return err;

		}

	}

	}



	return 0;

}