diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-09-27 20:40:22 +0800 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 19:53:38 +0100 |
commit | 4addfd88ea6c5f6dba60aa43efa45551f4604b88 (patch) | |
tree | ee13b916de77089569e9e10d88c5523cc737de45 | |
parent | b6ba8cc287f7dde9302d8b152f8e60cd570ecbc8 (diff) | |
download | op-kernel-dev-4addfd88ea6c5f6dba60aa43efa45551f4604b88.zip op-kernel-dev-4addfd88ea6c5f6dba60aa43efa45551f4604b88.tar.gz |
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>
-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 b085575..9fc8f4c 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] = { struct wm8904_priv { enum wm8904_type devtype; - void *control_data; struct regulator_bulk_data supplies[WM8904_NUM_SUPPLIES]; @@ -2540,7 +2539,6 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, wm8904->devtype = id->driver_data; i2c_set_clientdata(i2c, wm8904); - wm8904->control_data = i2c; wm8904->pdata = i2c->dev.platform_data; ret = snd_soc_register_codec(&i2c->dev, |