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/wm8961.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/wm8961.c')
-rw-r--r-- | sound/soc/codecs/wm8961.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8961.c b/sound/soc/codecs/wm8961.c index 5ebe2c04e5cf..fa36a62972f8 100644 --- a/sound/soc/codecs/wm8961.c +++ b/sound/soc/codecs/wm8961.c | |||
@@ -289,7 +289,6 @@ static u16 wm8961_reg_defaults[] = { | |||
289 | 289 | ||
290 | struct wm8961_priv { | 290 | struct wm8961_priv { |
291 | enum snd_soc_control_type control_type; | 291 | enum snd_soc_control_type control_type; |
292 | void *control_data; | ||
293 | int sysclk; | 292 | int sysclk; |
294 | u16 reg_cache[WM8961_MAX_REGISTER]; | 293 | u16 reg_cache[WM8961_MAX_REGISTER]; |
295 | }; | 294 | }; |
@@ -964,7 +963,6 @@ static int wm8961_probe(struct snd_soc_codec *codec) | |||
964 | int ret = 0; | 963 | int ret = 0; |
965 | u16 reg; | 964 | u16 reg; |
966 | 965 | ||
967 | codec->control_data = wm8961->control_data; | ||
968 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); | 966 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); |
969 | if (ret != 0) { | 967 | if (ret != 0) { |
970 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 968 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -1096,7 +1094,6 @@ static __devinit int wm8961_i2c_probe(struct i2c_client *i2c, | |||
1096 | return -ENOMEM; | 1094 | return -ENOMEM; |
1097 | 1095 | ||
1098 | i2c_set_clientdata(i2c, wm8961); | 1096 | i2c_set_clientdata(i2c, wm8961); |
1099 | wm8961->control_data = i2c; | ||
1100 | 1097 | ||
1101 | ret = snd_soc_register_codec(&i2c->dev, | 1098 | ret = snd_soc_register_codec(&i2c->dev, |
1102 | &soc_codec_dev_wm8961, &wm8961_dai, 1); | 1099 | &soc_codec_dev_wm8961, &wm8961_dai, 1); |