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/wm8903.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/wm8903.c')
-rw-r--r-- | sound/soc/codecs/wm8903.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index f5d73ed72cbd..622b60238a82 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
@@ -217,7 +217,6 @@ struct wm8903_priv { | |||
217 | u16 reg_cache[ARRAY_SIZE(wm8903_reg_defaults)]; | 217 | u16 reg_cache[ARRAY_SIZE(wm8903_reg_defaults)]; |
218 | 218 | ||
219 | int sysclk; | 219 | int sysclk; |
220 | struct i2c_client *control_data; | ||
221 | int irq; | 220 | int irq; |
222 | 221 | ||
223 | /* Reference counts */ | 222 | /* Reference counts */ |
@@ -1639,7 +1638,6 @@ static int wm8903_probe(struct snd_soc_codec *codec) | |||
1639 | u16 val; | 1638 | u16 val; |
1640 | 1639 | ||
1641 | init_completion(&wm8903->wseq); | 1640 | init_completion(&wm8903->wseq); |
1642 | codec->control_data = wm8903->control_data; | ||
1643 | 1641 | ||
1644 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); | 1642 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); |
1645 | if (ret != 0) { | 1643 | if (ret != 0) { |
@@ -1779,7 +1777,6 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c, | |||
1779 | return -ENOMEM; | 1777 | return -ENOMEM; |
1780 | 1778 | ||
1781 | i2c_set_clientdata(i2c, wm8903); | 1779 | i2c_set_clientdata(i2c, wm8903); |
1782 | wm8903->control_data = i2c; | ||
1783 | wm8903->irq = i2c->irq; | 1780 | wm8903->irq = i2c->irq; |
1784 | 1781 | ||
1785 | ret = snd_soc_register_codec(&i2c->dev, | 1782 | ret = snd_soc_register_codec(&i2c->dev, |