aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8990.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
-rw-r--r--sound/soc/codecs/wm8990.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c
index b25243382966..0ffecbd1e33b 100644
--- a/sound/soc/codecs/wm8990.c
+++ b/sound/soc/codecs/wm8990.c
@@ -33,7 +33,6 @@
33/* codec private data */ 33/* codec private data */
34struct wm8990_priv { 34struct wm8990_priv {
35 enum snd_soc_control_type control_type; 35 enum snd_soc_control_type control_type;
36 void *control_data;
37 unsigned int sysclk; 36 unsigned int sysclk;
38 unsigned int pcmclk; 37 unsigned int pcmclk;
39}; 38};
@@ -1343,11 +1342,9 @@ static int wm8990_resume(struct snd_soc_codec *codec)
1343 */ 1342 */
1344static int wm8990_probe(struct snd_soc_codec *codec) 1343static int wm8990_probe(struct snd_soc_codec *codec)
1345{ 1344{
1346 struct wm8990_priv *wm8990 = snd_soc_codec_get_drvdata(codec);
1347 int ret; 1345 int ret;
1348 u16 reg; 1346 u16 reg;
1349 1347
1350 codec->control_data = wm8990->control_data;
1351 ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); 1348 ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
1352 if (ret < 0) { 1349 if (ret < 0) {
1353 printk(KERN_ERR "wm8990: failed to set cache I/O: %d\n", ret); 1350 printk(KERN_ERR "wm8990: failed to set cache I/O: %d\n", ret);
@@ -1410,7 +1407,6 @@ static __devinit int wm8990_i2c_probe(struct i2c_client *i2c,
1410 return -ENOMEM; 1407 return -ENOMEM;
1411 1408
1412 i2c_set_clientdata(i2c, wm8990); 1409 i2c_set_clientdata(i2c, wm8990);
1413 wm8990->control_data = i2c;
1414 1410
1415 ret = snd_soc_register_codec(&i2c->dev, 1411 ret = snd_soc_register_codec(&i2c->dev,
1416 &soc_codec_dev_wm8990, &wm8990_dai, 1); 1412 &soc_codec_dev_wm8990, &wm8990_dai, 1);