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

ASoC: soc-ops: cleanup cppcheck warning at snd_soc_put_xr_sx() 



This patch cleanups below cppcheck warning.

sound/soc/soc-ops.c:859:18: style: The scope of the variable 'regval' can be reduced. [variableScope]
 unsigned int i, regval, regmask;
                 ^
sound/soc/soc-ops.c:859:26: style: The scope of the variable 'regmask' can be reduced. [variableScope]
 unsigned int i, regval, regmask;
                         ^
sound/soc/soc-ops.c:860:6: style: The scope of the variable 'err' can be reduced. [variableScope]
 int err;
     ^

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


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

sound/soc/soc-ops.c

+5 −6
Original line number Diff line number Diff line
@@ -856,16 +856,15 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, 
	unsigned long mask = (1UL<<mc->nbits)-1;

	long max = mc->max;

	long val = ucontrol->value.integer.value[0];

	unsigned int i, regval, regmask;

	int err;

	unsigned int i;



	if (invert)

		val = max - val;

	val &= mask;

	for (i = 0; i < regcount; i++) {

		regval = (val >> (regwshift*(regcount-i-1))) & regwmask;

		regmask = (mask >> (regwshift*(regcount-i-1))) & regwmask;

		err = snd_soc_component_update_bits(component, regbase+i,

		unsigned int regval = (val >> (regwshift*(regcount-i-1))) & regwmask;

		unsigned int regmask = (mask >> (regwshift*(regcount-i-1))) & regwmask;

		int err = snd_soc_component_update_bits(component, regbase+i,

							regmask, regval);

		if (err < 0)

			return err;