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/wm8510.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/wm8510.c')
-rw-r--r-- | sound/soc/codecs/wm8510.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8510.c b/sound/soc/codecs/wm8510.c index 1c623de4a4cd..d00da2001a12 100644 --- a/sound/soc/codecs/wm8510.c +++ b/sound/soc/codecs/wm8510.c | |||
@@ -60,7 +60,6 @@ static const u16 wm8510_reg[WM8510_CACHEREGNUM] = { | |||
60 | /* codec private data */ | 60 | /* codec private data */ |
61 | struct wm8510_priv { | 61 | struct wm8510_priv { |
62 | enum snd_soc_control_type control_type; | 62 | enum snd_soc_control_type control_type; |
63 | void *control_data; | ||
64 | }; | 63 | }; |
65 | 64 | ||
66 | static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" }; | 65 | static const char *wm8510_companding[] = { "Off", "NC", "u-law", "A-law" }; |
@@ -561,7 +560,6 @@ static int wm8510_probe(struct snd_soc_codec *codec) | |||
561 | struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec); | 560 | struct wm8510_priv *wm8510 = snd_soc_codec_get_drvdata(codec); |
562 | int ret; | 561 | int ret; |
563 | 562 | ||
564 | codec->control_data = wm8510->control_data; | ||
565 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8510->control_type); | 563 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8510->control_type); |
566 | if (ret < 0) { | 564 | if (ret < 0) { |
567 | printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret); | 565 | printk(KERN_ERR "wm8510: failed to set cache I/O: %d\n", ret); |
@@ -611,7 +609,6 @@ static int __devinit wm8510_spi_probe(struct spi_device *spi) | |||
611 | if (wm8510 == NULL) | 609 | if (wm8510 == NULL) |
612 | return -ENOMEM; | 610 | return -ENOMEM; |
613 | 611 | ||
614 | wm8510->control_data = spi; | ||
615 | wm8510->control_type = SND_SOC_SPI; | 612 | wm8510->control_type = SND_SOC_SPI; |
616 | spi_set_drvdata(spi, wm8510); | 613 | spi_set_drvdata(spi, wm8510); |
617 | 614 | ||
@@ -651,7 +648,6 @@ static __devinit int wm8510_i2c_probe(struct i2c_client *i2c, | |||
651 | return -ENOMEM; | 648 | return -ENOMEM; |
652 | 649 | ||
653 | i2c_set_clientdata(i2c, wm8510); | 650 | i2c_set_clientdata(i2c, wm8510); |
654 | wm8510->control_data = i2c; | ||
655 | wm8510->control_type = SND_SOC_I2C; | 651 | wm8510->control_type = SND_SOC_I2C; |
656 | 652 | ||
657 | ret = snd_soc_register_codec(&i2c->dev, | 653 | ret = snd_soc_register_codec(&i2c->dev, |