aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8955.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/wm8955.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/wm8955.c')
-rw-r--r--sound/soc/codecs/wm8955.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8955.c b/sound/soc/codecs/wm8955.c
index a5a9f8ef5771..f89ad6c9a80b 100644
--- a/sound/soc/codecs/wm8955.c
+++ b/sound/soc/codecs/wm8955.c
@@ -41,7 +41,6 @@ static const char *wm8955_supply_names[WM8955_NUM_SUPPLIES] = {
41/* codec private data */ 41/* codec private data */
42struct wm8955_priv { 42struct wm8955_priv {
43 enum snd_soc_control_type control_type; 43 enum snd_soc_control_type control_type;
44 void *control_data;
45 44
46 u16 reg_cache[WM8955_MAX_REGISTER + 1]; 45 u16 reg_cache[WM8955_MAX_REGISTER + 1];
47 46
@@ -904,7 +903,6 @@ static int wm8955_probe(struct snd_soc_codec *codec)
904 struct wm8955_pdata *pdata = dev_get_platdata(codec->dev); 903 struct wm8955_pdata *pdata = dev_get_platdata(codec->dev);
905 int ret, i; 904 int ret, i;
906 905
907 codec->control_data = wm8955->control_data;
908 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8955->control_type); 906 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8955->control_type);
909 if (ret != 0) { 907 if (ret != 0) {
910 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 908 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -1004,7 +1002,6 @@ static __devinit int wm8955_i2c_probe(struct i2c_client *i2c,
1004 return -ENOMEM; 1002 return -ENOMEM;
1005 1003
1006 i2c_set_clientdata(i2c, wm8955); 1004 i2c_set_clientdata(i2c, wm8955);
1007 wm8955->control_data = i2c;
1008 1005
1009 ret = snd_soc_register_codec(&i2c->dev, 1006 ret = snd_soc_register_codec(&i2c->dev,
1010 &soc_codec_dev_wm8955, &wm8955_dai, 1); 1007 &soc_codec_dev_wm8955, &wm8955_dai, 1);