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/wm8753.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/wm8753.c')
-rw-r--r-- | sound/soc/codecs/wm8753.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 976e408b3616..484423248c26 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c | |||
@@ -86,7 +86,6 @@ static const u16 wm8753_reg[] = { | |||
86 | /* codec private data */ | 86 | /* codec private data */ |
87 | struct wm8753_priv { | 87 | struct wm8753_priv { |
88 | enum snd_soc_control_type control_type; | 88 | enum snd_soc_control_type control_type; |
89 | void *control_data; | ||
90 | unsigned int sysclk; | 89 | unsigned int sysclk; |
91 | unsigned int pcmclk; | 90 | unsigned int pcmclk; |
92 | u16 reg_cache[ARRAY_SIZE(wm8753_reg)]; | 91 | u16 reg_cache[ARRAY_SIZE(wm8753_reg)]; |
@@ -1551,8 +1550,7 @@ static int wm8753_probe(struct snd_soc_codec *codec) | |||
1551 | struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); | 1550 | struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); |
1552 | int ret = 0, reg; | 1551 | int ret = 0, reg; |
1553 | 1552 | ||
1554 | codec->bias_level = SND_SOC_BIAS_OFF, | 1553 | codec->bias_level = SND_SOC_BIAS_OFF; |
1555 | codec->control_data = wm8753->control_data; | ||
1556 | INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work); | 1554 | INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work); |
1557 | 1555 | ||
1558 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type); | 1556 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type); |
@@ -1637,7 +1635,6 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) | |||
1637 | if (wm8753 == NULL) | 1635 | if (wm8753 == NULL) |
1638 | return -ENOMEM; | 1636 | return -ENOMEM; |
1639 | 1637 | ||
1640 | wm8753->control_data = spi; | ||
1641 | wm8753->control_type = SND_SOC_SPI; | 1638 | wm8753->control_type = SND_SOC_SPI; |
1642 | spi_set_drvdata(spi, wm8753); | 1639 | spi_set_drvdata(spi, wm8753); |
1643 | 1640 | ||
@@ -1678,7 +1675,6 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c, | |||
1678 | return -ENOMEM; | 1675 | return -ENOMEM; |
1679 | 1676 | ||
1680 | i2c_set_clientdata(i2c, wm8753); | 1677 | i2c_set_clientdata(i2c, wm8753); |
1681 | wm8753->control_data = i2c; | ||
1682 | wm8753->control_type = SND_SOC_I2C; | 1678 | wm8753->control_type = SND_SOC_I2C; |
1683 | 1679 | ||
1684 | ret = snd_soc_register_codec(&i2c->dev, | 1680 | ret = snd_soc_register_codec(&i2c->dev, |