summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8753.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/wm8753.c
parent26e277d7151abcef8efa1e6f1f0d1420d4ed17c6 (diff)
downloadop-kernel-dev-af3751a0bfe4d461e0567961dc06448f2128e26f.zip
op-kernel-dev-af3751a0bfe4d461e0567961dc06448f2128e26f.tar.gz
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/wm8753.c')
-rw-r--r--sound/soc/codecs/wm8753.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
index 976e408..4844232 100644
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@ -86,7 +86,6 @@ static const u16 wm8753_reg[] = {
/* codec private data */
struct wm8753_priv {
enum snd_soc_control_type control_type;
- void *control_data;
unsigned int sysclk;
unsigned int pcmclk;
u16 reg_cache[ARRAY_SIZE(wm8753_reg)];
@@ -1551,8 +1550,7 @@ static int wm8753_probe(struct snd_soc_codec *codec)
struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
int ret = 0, reg;
- codec->bias_level = SND_SOC_BIAS_OFF,
- codec->control_data = wm8753->control_data;
+ codec->bias_level = SND_SOC_BIAS_OFF;
INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type);
@@ -1637,7 +1635,6 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi)
if (wm8753 == NULL)
return -ENOMEM;
- wm8753->control_data = spi;
wm8753->control_type = SND_SOC_SPI;
spi_set_drvdata(spi, wm8753);
@@ -1678,7 +1675,6 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c,
return -ENOMEM;
i2c_set_clientdata(i2c, wm8753);
- wm8753->control_data = i2c;
wm8753->control_type = SND_SOC_I2C;
ret = snd_soc_register_codec(&i2c->dev,
OpenPOWER on IntegriCloud