aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8993.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8993.c')
-rw-r--r--sound/soc/codecs/wm8993.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8993.c b/sound/soc/codecs/wm8993.c
index 1d9e1837a2df..a3fd6b935804 100644
--- a/sound/soc/codecs/wm8993.c
+++ b/sound/soc/codecs/wm8993.c
@@ -230,7 +230,6 @@ struct wm8993_priv {
230 struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES]; 230 struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES];
231 struct wm8993_platform_data pdata; 231 struct wm8993_platform_data pdata;
232 enum snd_soc_control_type control_type; 232 enum snd_soc_control_type control_type;
233 void *control_data;
234 int master; 233 int master;
235 int sysclk_source; 234 int sysclk_source;
236 int tdm_slots; 235 int tdm_slots;
@@ -1425,7 +1424,6 @@ static int wm8993_probe(struct snd_soc_codec *codec)
1425 struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); 1424 struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec);
1426 int ret, i, val; 1425 int ret, i, val;
1427 1426
1428 codec->control_data = wm8993->control_data;
1429 wm8993->hubs_data.hp_startup_mode = 1; 1427 wm8993->hubs_data.hp_startup_mode = 1;
1430 wm8993->hubs_data.dcs_codes = -2; 1428 wm8993->hubs_data.dcs_codes = -2;
1431 1429
@@ -1606,7 +1604,6 @@ static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
1606 return -ENOMEM; 1604 return -ENOMEM;
1607 1605
1608 i2c_set_clientdata(i2c, wm8993); 1606 i2c_set_clientdata(i2c, wm8993);
1609 wm8993->control_data = i2c;
1610 1607
1611 ret = snd_soc_register_codec(&i2c->dev, 1608 ret = snd_soc_register_codec(&i2c->dev,
1612 &soc_codec_dev_wm8993, &wm8993_dai, 1); 1609 &soc_codec_dev_wm8993, &wm8993_dai, 1);