diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-09-27 08:40:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 14:53:38 -0400 |
commit | 4addfd88ea6c5f6dba60aa43efa45551f4604b88 (patch) | |
tree | ee13b916de77089569e9e10d88c5523cc737de45 /sound/soc/codecs/wm8904.c | |
parent | b6ba8cc287f7dde9302d8b152f8e60cd570ecbc8 (diff) |
ASoC: Remove unused "control_data" field of struct wm8904_priv
The control_data field is used to initialize the codec's control_data field,
but since this is also done by the snd-soc-cache core, the redundant
assignment can be removed and the field can be dropped.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8904.c')
-rw-r--r-- | sound/soc/codecs/wm8904.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8904.c b/sound/soc/codecs/wm8904.c index b085575d4aa5..9fc8f4c0a9a9 100644 --- a/sound/soc/codecs/wm8904.c +++ b/sound/soc/codecs/wm8904.c | |||
@@ -50,7 +50,6 @@ static const char *wm8904_supply_names[WM8904_NUM_SUPPLIES] = { | |||
50 | struct wm8904_priv { | 50 | struct wm8904_priv { |
51 | 51 | ||
52 | enum wm8904_type devtype; | 52 | enum wm8904_type devtype; |
53 | void *control_data; | ||
54 | 53 | ||
55 | struct regulator_bulk_data supplies[WM8904_NUM_SUPPLIES]; | 54 | struct regulator_bulk_data supplies[WM8904_NUM_SUPPLIES]; |
56 | 55 | ||
@@ -2540,7 +2539,6 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, | |||
2540 | 2539 | ||
2541 | wm8904->devtype = id->driver_data; | 2540 | wm8904->devtype = id->driver_data; |
2542 | i2c_set_clientdata(i2c, wm8904); | 2541 | i2c_set_clientdata(i2c, wm8904); |
2543 | wm8904->control_data = i2c; | ||
2544 | wm8904->pdata = i2c->dev.platform_data; | 2542 | wm8904->pdata = i2c->dev.platform_data; |
2545 | 2543 | ||
2546 | ret = snd_soc_register_codec(&i2c->dev, | 2544 | ret = snd_soc_register_codec(&i2c->dev, |