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

ASoC: soc-pcm: cleanup cppcheck warning at soc_pcm_apply_msb() 



This patch cleanups below cppcheck warning.

sound/soc/soc-pcm.c:446:29: style: The scope of the variable 'pcm_codec' can be reduced. [variableScope]
 struct snd_soc_pcm_stream *pcm_codec, *pcm_cpu;
                            ^
sound/soc/soc-pcm.c:446:41: style: The scope of the variable 'pcm_cpu' can be reduced. [variableScope]
 struct snd_soc_pcm_stream *pcm_codec, *pcm_cpu;
                                        ^

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


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

sound/soc/soc-pcm.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -449,13 +449,12 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) 
	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);

	struct snd_soc_dai *cpu_dai;

	struct snd_soc_dai *cpu_dai;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_dai *codec_dai;

	struct snd_soc_pcm_stream *pcm_codec, *pcm_cpu;

	int stream = substream->stream;

	int stream = substream->stream;

	int i;

	int i;

	unsigned int bits = 0, cpu_bits = 0;

	unsigned int bits = 0, cpu_bits = 0;





	for_each_rtd_codec_dais(rtd, i, codec_dai) {

	for_each_rtd_codec_dais(rtd, i, codec_dai) {

		pcm_codec = snd_soc_dai_get_pcm_stream(codec_dai, stream);

		struct snd_soc_pcm_stream *pcm_codec = snd_soc_dai_get_pcm_stream(codec_dai, stream);





		if (pcm_codec->sig_bits == 0) {

		if (pcm_codec->sig_bits == 0) {

			bits = 0;

			bits = 0;
@@ -465,7 +464,7 @@ static void soc_pcm_apply_msb(struct snd_pcm_substream *substream) 
	}

	}





	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {

	for_each_rtd_cpu_dais(rtd, i, cpu_dai) {

		pcm_cpu = snd_soc_dai_get_pcm_stream(cpu_dai, stream);

		struct snd_soc_pcm_stream *pcm_cpu = snd_soc_dai_get_pcm_stream(cpu_dai, stream);





		if (pcm_cpu->sig_bits == 0) {

		if (pcm_cpu->sig_bits == 0) {

			cpu_bits = 0;

			cpu_bits = 0;