From 7b3a70952c109e93ac37de0115a9aa30b3b932cc Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Fri, 30 Sep 2011 10:32:37 +0800
Subject: [PATCH] --- yaml --- r: 270710 b: refs/heads/master c:
 6423aa9154e247752e8894ad686959d39be659f9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2f20f0d8f830..a22cf04a4382 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5382ffbb179459b81b36ef47e58b84e3e1eff862
+refs/heads/master: 6423aa9154e247752e8894ad686959d39be659f9
diff --git a/trunk/sound/soc/codecs/tlv320aic3x.c b/trunk/sound/soc/codecs/tlv320aic3x.c
index 0963c4c7a83f..4c5eab59f99b 100644
--- a/trunk/sound/soc/codecs/tlv320aic3x.c
+++ b/trunk/sound/soc/codecs/tlv320aic3x.c
@@ -76,7 +76,6 @@ struct aic3x_priv {
 	struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES];
 	enum snd_soc_control_type control_type;
 	struct aic3x_setup_data *setup;
-	void *control_data;
 	unsigned int sysclk;
 	struct list_head list;
 	int master;
@@ -1383,7 +1382,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
 	int ret, i;
 
 	INIT_LIST_HEAD(&aic3x->list);
-	codec->control_data = aic3x->control_data;
 	aic3x->codec = codec;
 	codec->dapm.idle_bias_off = 1;
 
@@ -1520,7 +1518,6 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
 		return -ENOMEM;
 	}
 
-	aic3x->control_data = i2c;
 	aic3x->control_type = SND_SOC_I2C;
 
 	i2c_set_clientdata(i2c, aic3x);