aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8974.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-12 06:04:14 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-08-12 09:00:19 -0400
commitaf3751a0bfe4d461e0567961dc06448f2128e26f (patch)
tree650de7f2083e20173483673a28d55e5f1e32cbe4 /sound/soc/codecs/wm8974.c
parent26e277d7151abcef8efa1e6f1f0d1420d4ed17c6 (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/wm8974.c')
-rw-r--r--sound/soc/codecs/wm8974.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8974.c b/sound/soc/codecs/wm8974.c
index 52f631c62e29..e61728b7339f 100644
--- a/sound/soc/codecs/wm8974.c
+++ b/sound/soc/codecs/wm8974.c
@@ -52,7 +52,6 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
52 52
53struct wm8974_priv { 53struct wm8974_priv {
54 enum snd_soc_control_type control_type; 54 enum snd_soc_control_type control_type;
55 void *control_data;
56 u16 reg_cache[WM8974_CACHEREGNUM]; 55 u16 reg_cache[WM8974_CACHEREGNUM];
57}; 56};
58 57
@@ -611,7 +610,6 @@ static int wm8974_probe(struct snd_soc_codec *codec)
611 struct wm8974_priv *wm8974 = snd_soc_codec_get_drvdata(codec); 610 struct wm8974_priv *wm8974 = snd_soc_codec_get_drvdata(codec);
612 int ret = 0; 611 int ret = 0;
613 612
614 codec->control_data = wm8974->control_data;
615 ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C); 613 ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C);
616 if (ret < 0) { 614 if (ret < 0) {
617 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 615 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -662,7 +660,6 @@ static __devinit int wm8974_i2c_probe(struct i2c_client *i2c,
662 return -ENOMEM; 660 return -ENOMEM;
663 661
664 i2c_set_clientdata(i2c, wm8974); 662 i2c_set_clientdata(i2c, wm8974);
665 wm8974->control_data = i2c;
666 663
667 ret = snd_soc_register_codec(&i2c->dev, 664 ret = snd_soc_register_codec(&i2c->dev,
668 &soc_codec_dev_wm8974, &wm8974_dai, 1); 665 &soc_codec_dev_wm8974, &wm8974_dai, 1);