From 516c8af3ffc0de548cb684b229b54ec4b1b18d64 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 24 Jan 2012 19:51:34 +0000
Subject: [PATCH] --- yaml --- r: 293230 b: refs/heads/master c:
 5509f2f80c711add6bbcec9af7f4bbba2e2cc22b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm5100.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce0cd93581ef..aa222a69d9ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b52f10ec6131e1aff49e7823a67732cdc066a0
+refs/heads/master: 5509f2f80c711add6bbcec9af7f4bbba2e2cc22b
diff --git a/trunk/sound/soc/codecs/wm5100.c b/trunk/sound/soc/codecs/wm5100.c
index e40c81eaec38..714256e609c1 100644
--- a/trunk/sound/soc/codecs/wm5100.c
+++ b/trunk/sound/soc/codecs/wm5100.c
@@ -1346,7 +1346,7 @@ static int wm5100_set_bias_level(struct snd_soc_codec *codec,
 				 enum snd_soc_bias_level level)
 {
 	struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
-	int ret, i;
+	int ret;
 
 	switch (level) {
 	case SND_SOC_BIAS_ON:
@@ -2504,7 +2504,6 @@ static int wm5100_probe(struct snd_soc_codec *codec)
 static int wm5100_remove(struct snd_soc_codec *codec)
 {
 	struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
-	struct i2c_client *i2c = to_i2c_client(codec->dev);
 
 	if (wm5100->pdata.hp_pol) {
 		gpio_free(wm5100->pdata.hp_pol);