diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-12 06:04:14 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2010-08-12 09:00:19 -0400 |
commit | af3751a0bfe4d461e0567961dc06448f2128e26f (patch) | |
tree | 650de7f2083e20173483673a28d55e5f1e32cbe4 /sound/soc/codecs/wm8900.c | |
parent | 26e277d7151abcef8efa1e6f1f0d1420d4ed17c6 (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/wm8900.c')
-rw-r--r-- | sound/soc/codecs/wm8900.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 33c3b57f3f6..1378aab5ca7 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c | |||
@@ -140,7 +140,6 @@ | |||
140 | 140 | ||
141 | struct wm8900_priv { | 141 | struct wm8900_priv { |
142 | enum snd_soc_control_type control_type; | 142 | enum snd_soc_control_type control_type; |
143 | void *control_data; | ||
144 | u16 reg_cache[WM8900_MAXREG]; | 143 | u16 reg_cache[WM8900_MAXREG]; |
145 | 144 | ||
146 | u32 fll_in; /* FLL input frequency */ | 145 | u32 fll_in; /* FLL input frequency */ |
@@ -1189,7 +1188,6 @@ static int wm8900_probe(struct snd_soc_codec *codec) | |||
1189 | struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec); | 1188 | struct wm8900_priv *wm8900 = snd_soc_codec_get_drvdata(codec); |
1190 | int ret = 0, reg; | 1189 | int ret = 0, reg; |
1191 | 1190 | ||
1192 | codec->control_data = wm8900->control_data; | ||
1193 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8900->control_type); | 1191 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm8900->control_type); |
1194 | if (ret != 0) { | 1192 | if (ret != 0) { |
1195 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 1193 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -1273,7 +1271,6 @@ static int __devinit wm8900_spi_probe(struct spi_device *spi) | |||
1273 | if (wm8900 == NULL) | 1271 | if (wm8900 == NULL) |
1274 | return -ENOMEM; | 1272 | return -ENOMEM; |
1275 | 1273 | ||
1276 | wm8900->control_data = spi; | ||
1277 | wm8900->control_type = SND_SOC_SPI; | 1274 | wm8900->control_type = SND_SOC_SPI; |
1278 | spi_set_drvdata(spi, wm8900); | 1275 | spi_set_drvdata(spi, wm8900); |
1279 | 1276 | ||
@@ -1314,7 +1311,6 @@ static __devinit int wm8900_i2c_probe(struct i2c_client *i2c, | |||
1314 | return -ENOMEM; | 1311 | return -ENOMEM; |
1315 | 1312 | ||
1316 | i2c_set_clientdata(i2c, wm8900); | 1313 | i2c_set_clientdata(i2c, wm8900); |
1317 | wm8900->control_data = i2c; | ||
1318 | wm8900->control_type = SND_SOC_I2C; | 1314 | wm8900->control_type = SND_SOC_I2C; |
1319 | 1315 | ||
1320 | ret = snd_soc_register_codec(&i2c->dev, | 1316 | ret = snd_soc_register_codec(&i2c->dev, |