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

ASoC: soc-pcm: cleanup soc_pcm_apply_symmetry() 



soc_pcm_apply_symmetry() want to call snd_pcm_hw_constraint_single()
for rate/channel/sample_bits, but, it needs many condition check.
These are very similar but different, thus, it needs to have very
verbose code.
This patch use macro for it and make code more simple.

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


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

sound/soc/soc-pcm.c

+20 −47
Original line number Diff line number Diff line
@@ -349,53 +349,26 @@ 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 (soc_dai->rate && (soc_dai->driver->symmetric_rates ||

				rtd->dai_link->symmetric_rates)) {

		dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %dHz rate\n",

				soc_dai->rate);



		ret = snd_pcm_hw_constraint_single(substream->runtime,

						SNDRV_PCM_HW_PARAM_RATE,

						soc_dai->rate);

		if (ret < 0) {

			dev_err(soc_dai->dev,

				"ASoC: Unable to apply rate constraint: %d\n",

				ret);

			return ret;

		}

	}



	if (soc_dai->channels && (soc_dai->driver->symmetric_channels ||

				rtd->dai_link->symmetric_channels)) {

		dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d channel(s)\n",

				soc_dai->channels);



		ret = snd_pcm_hw_constraint_single(substream->runtime,

						SNDRV_PCM_HW_PARAM_CHANNELS,

						soc_dai->channels);

		if (ret < 0) {

			dev_err(soc_dai->dev,

				"ASoC: Unable to apply channel symmetry constraint: %d\n",

				ret);

			return ret;

		}

	}



	if (soc_dai->sample_bits && (soc_dai->driver->symmetric_samplebits ||

				rtd->dai_link->symmetric_samplebits)) {

		dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %d sample bits\n",

				soc_dai->sample_bits);



		ret = snd_pcm_hw_constraint_single(substream->runtime,

						SNDRV_PCM_HW_PARAM_SAMPLE_BITS,

						soc_dai->sample_bits);

		if (ret < 0) {

			dev_err(soc_dai->dev,

				"ASoC: Unable to apply sample bits symmetry constraint: %d\n",

				ret);

			return ret;

		}

	}

#define __soc_pcm_apply_symmetry(name, sname, NAME)			\

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

			      rtd->dai_link->symmetric_##sname)) {	\

		dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %s to %d\n",\

			#name, soc_dai->name);				\

									\

		ret = snd_pcm_hw_constraint_single(substream->runtime,	\

						   SNDRV_PCM_HW_PARAM_##NAME,\

						   soc_dai->name);	\

		if (ret < 0) {						\

			dev_err(soc_dai->dev,				\

				"ASoC: Unable to apply %s constraint: %d\n",\

				#name, ret);				\

			return ret;					\

		}							\

	}



	__soc_pcm_apply_symmetry(rate,		rates,		RATE);

	__soc_pcm_apply_symmetry(channels,	channels,	CHANNELS);

	__soc_pcm_apply_symmetry(sample_bits,	samplebits,	SAMPLE_BITS);



	return 0;

}