OSDN Git Service

ASoC: Fix shadowed variables in twl4030
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 20 Jun 2009 12:53:20 +0000 (13:53 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 20 Jun 2009 12:58:08 +0000 (13:58 +0100)
No need to define second copies of mode and format, they're declared
with exactly the same type at the head of the function and there's no
conflict in their use.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/twl4030.c

index 4dbb853..a5062cc 100644 (file)
@@ -1609,8 +1609,6 @@ static int twl4030_hw_params(struct snd_pcm_substream *substream,
 
         /* If the substream has 4 channel, do the necessary setup */
        if (params_channels(params) == 4) {
-               u8 format, mode;
-
                format = twl4030_read_reg_cache(codec, TWL4030_REG_AUDIO_IF);
                mode = twl4030_read_reg_cache(codec, TWL4030_REG_CODEC_MODE);