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/wm8750.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/wm8750.c')
-rw-r--r-- | sound/soc/codecs/wm8750.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8750.c b/sound/soc/codecs/wm8750.c index 89863a5bc830..92d4b2aef93b 100644 --- a/sound/soc/codecs/wm8750.c +++ b/sound/soc/codecs/wm8750.c | |||
@@ -53,7 +53,6 @@ static const u16 wm8750_reg[] = { | |||
53 | struct wm8750_priv { | 53 | struct wm8750_priv { |
54 | unsigned int sysclk; | 54 | unsigned int sysclk; |
55 | enum snd_soc_control_type control_type; | 55 | enum snd_soc_control_type control_type; |
56 | void *control_data; | ||
57 | u16 reg_cache[ARRAY_SIZE(wm8750_reg)]; | 56 | u16 reg_cache[ARRAY_SIZE(wm8750_reg)]; |
58 | }; | 57 | }; |
59 | 58 | ||
@@ -697,7 +696,6 @@ static int wm8750_probe(struct snd_soc_codec *codec) | |||
697 | struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec); | 696 | struct wm8750_priv *wm8750 = snd_soc_codec_get_drvdata(codec); |
698 | int reg, ret; | 697 | int reg, ret; |
699 | 698 | ||
700 | codec->control_data = wm8750->control_data; | ||
701 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8750->control_type); | 699 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8750->control_type); |
702 | if (ret < 0) { | 700 | if (ret < 0) { |
703 | printk(KERN_ERR "wm8750: failed to set cache I/O: %d\n", ret); | 701 | printk(KERN_ERR "wm8750: failed to set cache I/O: %d\n", ret); |
@@ -764,7 +762,6 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi) | |||
764 | if (wm8750 == NULL) | 762 | if (wm8750 == NULL) |
765 | return -ENOMEM; | 763 | return -ENOMEM; |
766 | 764 | ||
767 | wm8750->control_data = spi; | ||
768 | wm8750->control_type = SND_SOC_SPI; | 765 | wm8750->control_type = SND_SOC_SPI; |
769 | spi_set_drvdata(spi, wm8750); | 766 | spi_set_drvdata(spi, wm8750); |
770 | 767 | ||
@@ -805,7 +802,6 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, | |||
805 | return -ENOMEM; | 802 | return -ENOMEM; |
806 | 803 | ||
807 | i2c_set_clientdata(i2c, wm8750); | 804 | i2c_set_clientdata(i2c, wm8750); |
808 | wm8750->control_data = i2c; | ||
809 | wm8750->control_type = SND_SOC_I2C; | 805 | wm8750->control_type = SND_SOC_I2C; |
810 | 806 | ||
811 | ret = snd_soc_register_codec(&i2c->dev, | 807 | ret = snd_soc_register_codec(&i2c->dev, |