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/wm8731.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/wm8731.c')
-rw-r--r-- | sound/soc/codecs/wm8731.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 7da360ee1fee..19844fc8cb1d 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c | |||
@@ -43,7 +43,6 @@ static const char *wm8731_supply_names[WM8731_NUM_SUPPLIES] = { | |||
43 | /* codec private data */ | 43 | /* codec private data */ |
44 | struct wm8731_priv { | 44 | struct wm8731_priv { |
45 | enum snd_soc_control_type control_type; | 45 | enum snd_soc_control_type control_type; |
46 | void *control_data; | ||
47 | struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; | 46 | struct regulator_bulk_data supplies[WM8731_NUM_SUPPLIES]; |
48 | u16 reg_cache[WM8731_CACHEREGNUM]; | 47 | u16 reg_cache[WM8731_CACHEREGNUM]; |
49 | unsigned int sysclk; | 48 | unsigned int sysclk; |
@@ -463,7 +462,6 @@ static int wm8731_probe(struct snd_soc_codec *codec) | |||
463 | int ret = 0, i; | 462 | int ret = 0, i; |
464 | 463 | ||
465 | codec->bias_level = SND_SOC_BIAS_OFF, | 464 | codec->bias_level = SND_SOC_BIAS_OFF, |
466 | codec->control_data = wm8731->control_data; | ||
467 | 465 | ||
468 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type); | 466 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8731->control_type); |
469 | if (ret < 0) { | 467 | if (ret < 0) { |
@@ -557,7 +555,6 @@ static int __devinit wm8731_spi_probe(struct spi_device *spi) | |||
557 | if (wm8731 == NULL) | 555 | if (wm8731 == NULL) |
558 | return -ENOMEM; | 556 | return -ENOMEM; |
559 | 557 | ||
560 | wm8731->control_data = spi; | ||
561 | wm8731->control_type = SND_SOC_SPI; | 558 | wm8731->control_type = SND_SOC_SPI; |
562 | spi_set_drvdata(spi, wm8731); | 559 | spi_set_drvdata(spi, wm8731); |
563 | 560 | ||
@@ -598,7 +595,6 @@ static __devinit int wm8731_i2c_probe(struct i2c_client *i2c, | |||
598 | return -ENOMEM; | 595 | return -ENOMEM; |
599 | 596 | ||
600 | i2c_set_clientdata(i2c, wm8731); | 597 | i2c_set_clientdata(i2c, wm8731); |
601 | wm8731->control_data = i2c; | ||
602 | wm8731->control_type = SND_SOC_I2C; | 598 | wm8731->control_type = SND_SOC_I2C; |
603 | 599 | ||
604 | ret = snd_soc_register_codec(&i2c->dev, | 600 | ret = snd_soc_register_codec(&i2c->dev, |