---

yaml
---
r: 270687
b: refs/heads/master
c: 8c0c459
h: refs/heads/master
i:
  270685: 622298f
  270683: 7161cc7
  270679: 268af69
  270671: 9720d21
  270655: 0da7848
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec61bde573a9eec829a04822454ab4818f2f79b3
+refs/heads/master: 8c0c459ced458b19a589b3a31e5c1231bd1b887a

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);