Skip to content

Commit

Permalink
ASoC: Remove unused "control_data" field of struct wm8904_priv
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Mark Brown committed Sep 27, 2011
1 parent b6ba8cc commit 4addfd8
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions sound/soc/codecs/wm8904.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];

Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 4addfd8

Please sign in to comment.