From c45ca68b565cb01513383086d557bd51fc2ab096 Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Thu, 20 Sep 2012 13:57:27 -0500
Subject: [PATCH] --- yaml --- r: 332119 b: refs/heads/master c:
 0534951ba493a97eee646f62101cf88fac2308c6 h: refs/heads/master i:   332117:
 b798ef15da9d69f87519db180297693d83141d45   332115:
 c4291af0a8d51211b4a8828bd79054d79851c99a   332111:
 d54a4e3dc9b6e21837d6f5cb37d598cbf1623720 v: v3

---
 [refs]                          | 2 +-
 trunk/include/sound/wm8960.h    | 2 --
 trunk/sound/soc/codecs/wm8960.c | 5 -----
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f5ff38c8169b..a301dc7577a1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b306e84f9a15e465812d9b66f8d6ecadae806f4c
+refs/heads/master: 0534951ba493a97eee646f62101cf88fac2308c6
diff --git a/trunk/include/sound/wm8960.h b/trunk/include/sound/wm8960.h
index b5a1ab9ebb4a..e8ce8ee7d62d 100644
--- a/trunk/include/sound/wm8960.h
+++ b/trunk/include/sound/wm8960.h
@@ -18,8 +18,6 @@
 struct wm8960_data {
 	bool capless;  /* Headphone outputs configured in capless mode */
 
-	int dres;  /* Discharge resistance for headphone outputs */
-
 	bool shared_lrclk;  /* DAC and ADC LRCLKs are wired together */
 };
 
diff --git a/trunk/sound/soc/codecs/wm8960.c b/trunk/sound/soc/codecs/wm8960.c
index 782faa0a3b49..f0f6f6601785 100644
--- a/trunk/sound/soc/codecs/wm8960.c
+++ b/trunk/sound/soc/codecs/wm8960.c
@@ -962,11 +962,6 @@ static int wm8960_probe(struct snd_soc_codec *codec)
 	if (!pdata) {
 		dev_warn(codec->dev, "No platform data supplied\n");
 	} else {
-		if (pdata->dres > WM8960_DRES_MAX) {
-			dev_err(codec->dev, "Invalid DRES: %d\n", pdata->dres);
-			pdata->dres = 0;
-		}
-
 		if (pdata->capless)
 			wm8960->set_bias_level = wm8960_set_bias_level_capless;
 	}