aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8711.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/wm8711.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/wm8711.c')
-rw-r--r--sound/soc/codecs/wm8711.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index 8d942b3b111f..f8d9c60e7fad 100644
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -34,7 +34,6 @@
34/* codec private data */ 34/* codec private data */
35struct wm8711_priv { 35struct wm8711_priv {
36 enum snd_soc_control_type bus_type; 36 enum snd_soc_control_type bus_type;
37 void *control_data;
38 u16 reg_cache[WM8711_CACHEREGNUM]; 37 u16 reg_cache[WM8711_CACHEREGNUM];
39 unsigned int sysclk; 38 unsigned int sysclk;
40}; 39};
@@ -378,7 +377,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
378 struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec); 377 struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
379 int ret, reg; 378 int ret, reg;
380 379
381 codec->control_data = wm8711->control_data;
382 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type); 380 ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
383 if (ret < 0) { 381 if (ret < 0) {
384 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 382 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -436,7 +434,6 @@ static int __devinit wm8711_spi_probe(struct spi_device *spi)
436 return -ENOMEM; 434 return -ENOMEM;
437 435
438 spi_set_drvdata(spi, wm8711); 436 spi_set_drvdata(spi, wm8711);
439 wm8711->control_data = spi;
440 wm8711->bus_type = SND_SOC_SPI; 437 wm8711->bus_type = SND_SOC_SPI;
441 438
442 ret = snd_soc_register_codec(&spi->dev, 439 ret = snd_soc_register_codec(&spi->dev,
@@ -476,7 +473,6 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client,
476 return -ENOMEM; 473 return -ENOMEM;
477 474
478 i2c_set_clientdata(client, wm8711); 475 i2c_set_clientdata(client, wm8711);
479 wm8711->control_data = client;
480 wm8711->bus_type = SND_SOC_I2C; 476 wm8711->bus_type = SND_SOC_I2C;
481 477
482 ret = snd_soc_register_codec(&client->dev, 478 ret = snd_soc_register_codec(&client->dev,