summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8711.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 11:04:14 +0100
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-12 14:00:19 +0100
commitaf3751a0bfe4d461e0567961dc06448f2128e26f (patch)
tree650de7f2083e20173483673a28d55e5f1e32cbe4 /sound/soc/codecs/wm8711.c
parent26e277d7151abcef8efa1e6f1f0d1420d4ed17c6 (diff)
downloadlinux-stable-af3751a0bfe4d461e0567961dc06448f2128e26f.tar.gz
linux-stable-af3751a0bfe4d461e0567961dc06448f2128e26f.tar.bz2
linux-stable-af3751a0bfe4d461e0567961dc06448f2128e26f.zip
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 @@
/* codec private data */
struct wm8711_priv {
enum snd_soc_control_type bus_type;
- void *control_data;
u16 reg_cache[WM8711_CACHEREGNUM];
unsigned int sysclk;
};
@@ -378,7 +377,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
struct wm8711_priv *wm8711 = snd_soc_codec_get_drvdata(codec);
int ret, reg;
- codec->control_data = wm8711->control_data;
ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8711->bus_type);
if (ret < 0) {
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)
return -ENOMEM;
spi_set_drvdata(spi, wm8711);
- wm8711->control_data = spi;
wm8711->bus_type = SND_SOC_SPI;
ret = snd_soc_register_codec(&spi->dev,
@@ -476,7 +473,6 @@ static __devinit int wm8711_i2c_probe(struct i2c_client *client,
return -ENOMEM;
i2c_set_clientdata(client, wm8711);
- wm8711->control_data = client;
wm8711->bus_type = SND_SOC_I2C;
ret = snd_soc_register_codec(&client->dev,