Skip to content

Commit

Permalink
ASoC: Remove unused "control_data" field of struct aic3x_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 30, 2011
1 parent 5382ffb commit 6423aa9
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions sound/soc/codecs/tlv320aic3x.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ struct aic3x_priv {
struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES];
enum snd_soc_control_type control_type;
struct aic3x_setup_data *setup;
void *control_data;
unsigned int sysclk;
struct list_head list;
int master;
Expand Down Expand Up @@ -1383,7 +1382,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
int ret, i;

INIT_LIST_HEAD(&aic3x->list);
codec->control_data = aic3x->control_data;
aic3x->codec = codec;
codec->dapm.idle_bias_off = 1;

Expand Down Expand Up @@ -1520,7 +1518,6 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
return -ENOMEM;
}

aic3x->control_data = i2c;
aic3x->control_type = SND_SOC_I2C;

i2c_set_clientdata(i2c, aic3x);
Expand Down

0 comments on commit 6423aa9

Please sign in to comment.