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/wm8523.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/wm8523.c')
-rw-r--r-- | sound/soc/codecs/wm8523.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 58d411b6faaf..712ef7c76f90 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c | |||
@@ -41,7 +41,6 @@ static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = { | |||
41 | /* codec private data */ | 41 | /* codec private data */ |
42 | struct wm8523_priv { | 42 | struct wm8523_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[WM8523_REGISTER_COUNT]; | 44 | u16 reg_cache[WM8523_REGISTER_COUNT]; |
46 | struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES]; | 45 | struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES]; |
47 | unsigned int sysclk; | 46 | unsigned int sysclk; |
@@ -419,7 +418,6 @@ static int wm8523_probe(struct snd_soc_codec *codec) | |||
419 | int ret, i; | 418 | int ret, i; |
420 | 419 | ||
421 | codec->hw_write = (hw_write_t)i2c_master_send; | 420 | codec->hw_write = (hw_write_t)i2c_master_send; |
422 | codec->control_data = wm8523->control_data; | ||
423 | wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0]; | 421 | wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0]; |
424 | wm8523->rate_constraint.count = | 422 | wm8523->rate_constraint.count = |
425 | ARRAY_SIZE(wm8523->rate_constraint_list); | 423 | ARRAY_SIZE(wm8523->rate_constraint_list); |
@@ -528,7 +526,6 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, | |||
528 | return -ENOMEM; | 526 | return -ENOMEM; |
529 | 527 | ||
530 | i2c_set_clientdata(i2c, wm8523); | 528 | i2c_set_clientdata(i2c, wm8523); |
531 | wm8523->control_data = i2c; | ||
532 | wm8523->control_type = SND_SOC_I2C; | 529 | wm8523->control_type = SND_SOC_I2C; |
533 | 530 | ||
534 | ret = snd_soc_register_codec(&i2c->dev, | 531 | ret = snd_soc_register_codec(&i2c->dev, |