提交 6423aa91 编写于 作者: A Axel Lin 提交者: Mark Brown

ASoC: Remove unused "control_data" field of struct aic3x_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: NAxel Lin <axel.lin@gmail.com>
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
上级 5382ffbb
...@@ -76,7 +76,6 @@ struct aic3x_priv { ...@@ -76,7 +76,6 @@ struct aic3x_priv {
struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES]; struct aic3x_disable_nb disable_nb[AIC3X_NUM_SUPPLIES];
enum snd_soc_control_type control_type; enum snd_soc_control_type control_type;
struct aic3x_setup_data *setup; struct aic3x_setup_data *setup;
void *control_data;
unsigned int sysclk; unsigned int sysclk;
struct list_head list; struct list_head list;
int master; int master;
...@@ -1383,7 +1382,6 @@ static int aic3x_probe(struct snd_soc_codec *codec) ...@@ -1383,7 +1382,6 @@ static int aic3x_probe(struct snd_soc_codec *codec)
int ret, i; int ret, i;
INIT_LIST_HEAD(&aic3x->list); INIT_LIST_HEAD(&aic3x->list);
codec->control_data = aic3x->control_data;
aic3x->codec = codec; aic3x->codec = codec;
codec->dapm.idle_bias_off = 1; codec->dapm.idle_bias_off = 1;
...@@ -1520,7 +1518,6 @@ static int aic3x_i2c_probe(struct i2c_client *i2c, ...@@ -1520,7 +1518,6 @@ static int aic3x_i2c_probe(struct i2c_client *i2c,
return -ENOMEM; return -ENOMEM;
} }
aic3x->control_data = i2c;
aic3x->control_type = SND_SOC_I2C; aic3x->control_type = SND_SOC_I2C;
i2c_set_clientdata(i2c, aic3x); i2c_set_clientdata(i2c, aic3x);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册