aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8971.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 06:04:14 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-12 09:00:19 -0400
commitaf3751a0bfe4d461e0567961dc06448f2128e26f (patch)
tree650de7f2083e20173483673a28d55e5f1e32cbe4 /sound/soc/codecs/wm8971.c
parent26e277d7151abcef8efa1e6f1f0d1420d4ed17c6 (diff)
ASoC: Remove unneeded control_data management from Wolfson drivers
Now soc-cache.c can figure out the I2C and SPI control data from the device for the CODEC we don't need to manually assign it in drivers. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc/codecs/wm8971.c')
-rw-r--r--sound/soc/codecs/wm8971.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8971.c b/sound/soc/codecs/wm8971.c
index ad2692afbb3..1d460735c4d 100644
--- a/sound/soc/codecs/wm8971.c
+++ b/sound/soc/codecs/wm8971.c
@@ -39,7 +39,6 @@ static struct workqueue_struct *wm8971_workq = NULL;
39/* codec private data */ 39/* codec private data */
40struct wm8971_priv { 40struct wm8971_priv {
41 enum snd_soc_control_type control_type; 41 enum snd_soc_control_type control_type;
42 void *control_data;
43 unsigned int sysclk; 42 unsigned int sysclk;
44}; 43};
45 44
@@ -642,7 +641,6 @@ static int wm8971_probe(struct snd_soc_codec *codec)
642 641
643 pr_info("WM8971 Audio Codec %s", WM8971_VERSION); 642 pr_info("WM8971 Audio Codec %s", WM8971_VERSION);
644 643
645 codec->control_data = wm8971->control_data;
646 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8971->control_type); 644 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8971->control_type);
647 if (ret < 0) { 645 if (ret < 0) {
648 printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret); 646 printk(KERN_ERR "wm8971: failed to set cache I/O: %d\n", ret);
@@ -725,7 +723,6 @@ static __devinit int wm8971_i2c_probe(struct i2c_client *i2c,
725 return -ENOMEM; 723 return -ENOMEM;
726 724
727 i2c_set_clientdata(i2c, wm8971); 725 i2c_set_clientdata(i2c, wm8971);
728 wm8971->control_data = i2c;
729 726
730 ret = snd_soc_register_codec(&i2c->dev, 727 ret = snd_soc_register_codec(&i2c->dev,
731 &soc_codec_dev_wm8971, &wm8971_dai, 1); 728 &soc_codec_dev_wm8971, &wm8971_dai, 1);