From 965b0f9aa3471fac5dfab8fe4e77f43be069e22a Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 20 Sep 2011 12:59:35 +0100
Subject: [PATCH] --- yaml --- r: 270611 b: refs/heads/master c:
 f648de832dbf6d1947ce5a7c0ed24a3a71d8545b h: refs/heads/master i:   270609:
 b56acf29afe586a64c9fbcb23dfb194f3e5ffb68   270607:
 8fe814ccd775973480f7a7edacbc48da937a1798 v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/wm8962.c | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/[refs] b/[refs]
index 64739b60a2b7..1df9c51da793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26806a4266c5d3301d3858317e67b1cca7ccfebb
+refs/heads/master: f648de832dbf6d1947ce5a7c0ed24a3a71d8545b
diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c
index 8e397b286aa3..3676b38838d8 100644
--- a/trunk/sound/soc/codecs/wm8962.c
+++ b/trunk/sound/soc/codecs/wm8962.c
@@ -3660,31 +3660,6 @@ int wm8962_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack)
 }
 EXPORT_SYMBOL_GPL(wm8962_mic_detect);
 
-#ifdef CONFIG_PM
-static int wm8962_resume(struct snd_soc_codec *codec)
-{
-	u16 *reg_cache = codec->reg_cache;
-	int i;
-
-	/* Restore the registers */
-	for (i = 1; i < codec->driver->reg_cache_size; i++) {
-		switch (i) {
-		case WM8962_SOFTWARE_RESET:
-			continue;
-		default:
-			break;
-		}
-
-		if (reg_cache[i] != wm8962_reg[i])
-			snd_soc_write(codec, i, reg_cache[i]);
-	}
-
-	return 0;
-}
-#else
-#define wm8962_resume NULL
-#endif
-
 #if defined(CONFIG_INPUT) || defined(CONFIG_INPUT_MODULE)
 static int beep_rates[] = {
 	500, 1000, 2000, 4000,
@@ -4196,7 +4171,6 @@ static int wm8962_remove(struct snd_soc_codec *codec)
 static struct snd_soc_codec_driver soc_codec_dev_wm8962 = {
 	.probe =	wm8962_probe,
 	.remove =	wm8962_remove,
-	.resume =	wm8962_resume,
 	.set_bias_level = wm8962_set_bias_level,
 	.reg_cache_size = WM8962_MAX_REGISTER + 1,
 	.reg_word_size = sizeof(u16),