aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-20 13:53:20 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-06-20 13:58:08 +0100
commitb53109db5e016425b767e8e33669a5f41257e6e5 (patch)
tree6f358aeefb170a21b9232c2babe9b1ec943bafd0
parenta583cd53478f0c55b92f084bdbe3b66d2b4496df (diff)
downloadkernel_samsung_aries-b53109db5e016425b767e8e33669a5f41257e6e5.zip
kernel_samsung_aries-b53109db5e016425b767e8e33669a5f41257e6e5.tar.gz
kernel_samsung_aries-b53109db5e016425b767e8e33669a5f41257e6e5.tar.bz2
ASoC: Fix shadowed variables in twl4030
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>
-rw-r--r--sound/soc/codecs/twl4030.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 4dbb853..a5062cc 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -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);