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/wm8741.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/wm8741.c')
-rw-r--r-- | sound/soc/codecs/wm8741.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index 0c6d59e4d226..782fe539662b 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c | |||
@@ -41,7 +41,6 @@ static const char *wm8741_supply_names[WM8741_NUM_SUPPLIES] = { | |||
41 | /* codec private data */ | 41 | /* codec private data */ |
42 | struct wm8741_priv { | 42 | struct wm8741_priv { |
43 | enum snd_soc_control_type control_type; | 43 | enum snd_soc_control_type control_type; |
44 | void *control_data; | ||
45 | u16 reg_cache[WM8741_REGISTER_COUNT]; | 44 | u16 reg_cache[WM8741_REGISTER_COUNT]; |
46 | struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES]; | 45 | struct regulator_bulk_data supplies[WM8741_NUM_SUPPLIES]; |
47 | unsigned int sysclk; | 46 | unsigned int sysclk; |
@@ -347,7 +346,6 @@ static int wm8741_probe(struct snd_soc_codec *codec) | |||
347 | struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); | 346 | struct wm8741_priv *wm8741 = snd_soc_codec_get_drvdata(codec); |
348 | int ret = 0; | 347 | int ret = 0; |
349 | 348 | ||
350 | codec->control_data = wm8741->control_data; | ||
351 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type); | 349 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8741->control_type); |
352 | if (ret != 0) { | 350 | if (ret != 0) { |
353 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 351 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -415,7 +413,6 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, | |||
415 | } | 413 | } |
416 | 414 | ||
417 | i2c_set_clientdata(i2c, wm8741); | 415 | i2c_set_clientdata(i2c, wm8741); |
418 | wm8741->control_data = i2c; | ||
419 | wm8741->control_type = SND_SOC_I2C; | 416 | wm8741->control_type = SND_SOC_I2C; |
420 | 417 | ||
421 | ret = snd_soc_register_codec(&i2c->dev, | 418 | ret = snd_soc_register_codec(&i2c->dev, |