From d3732e8a8bea124b800959ef54ea41e7a3c6b763 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 27 Sep 2011 20:43:24 +0800
Subject: [PATCH] --- yaml --- r: 270687 b: refs/heads/master c:
 8c0c459ced458b19a589b3a31e5c1231bd1b887a h: refs/heads/master i:   270685:
 622298ffffbb05c5dc6b4a851b9fc222258b68dd   270683:
 7161cc7e30ecbf7b03a5545364a79f2d2d88b40d   270679:
 268af69e6ed115005b0f37f6b2960cedfa23016a   270671:
 9720d21c887d8967935cf5ff52b393e850f4e964   270655:
 0da7848df50f80fc34c9991adf7ed576792032bf v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8978.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec6a7cc6d873..91cf4f4888f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec61bde573a9eec829a04822454ab4818f2f79b3
+refs/heads/master: 8c0c459ced458b19a589b3a31e5c1231bd1b887a
diff --git a/trunk/sound/soc/codecs/wm8978.c b/trunk/sound/soc/codecs/wm8978.c
index 85e3e630e763..41ca4d9ac20c 100644
--- a/trunk/sound/soc/codecs/wm8978.c
+++ b/trunk/sound/soc/codecs/wm8978.c
@@ -52,7 +52,6 @@ static const u16 wm8978_reg[WM8978_CACHEREGNUM] = {
 /* codec private data */
 struct wm8978_priv {
 	enum snd_soc_control_type control_type;
-	void *control_data;
 	unsigned int f_pllout;
 	unsigned int f_mclk;
 	unsigned int f_256fs;
@@ -955,7 +954,6 @@ static int wm8978_probe(struct snd_soc_codec *codec)
 	 * default hardware setting
 	 */
 	wm8978->sysclk = WM8978_PLL;
-	codec->control_data = wm8978->control_data;
 	ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
 	if (ret < 0) {
 		dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1016,7 +1014,6 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 
 	i2c_set_clientdata(i2c, wm8978);
-	wm8978->control_data = i2c;
 
 	ret = snd_soc_register_codec(&i2c->dev,
 			&soc_codec_dev_wm8978, &wm8978_dai, 1);