Commit 6e342164 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

ASoC: Remove unused "control_data" field of struct wm9081_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: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8c0c459c
...@@ -157,7 +157,6 @@ static struct { ...@@ -157,7 +157,6 @@ static struct {
struct wm9081_priv { struct wm9081_priv {
enum snd_soc_control_type control_type; enum snd_soc_control_type control_type;
void *control_data;
int sysclk_source; int sysclk_source;
int mclk_rate; int mclk_rate;
int sysclk_rate; int sysclk_rate;
...@@ -1213,7 +1212,6 @@ static int wm9081_probe(struct snd_soc_codec *codec) ...@@ -1213,7 +1212,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)
int ret; int ret;
u16 reg; u16 reg;
codec->control_data = wm9081->control_data;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type); ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
...@@ -1330,7 +1328,6 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c, ...@@ -1330,7 +1328,6 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm9081); i2c_set_clientdata(i2c, wm9081);
wm9081->control_type = SND_SOC_I2C; wm9081->control_type = SND_SOC_I2C;
wm9081->control_data = i2c;
if (dev_get_platdata(&i2c->dev)) if (dev_get_platdata(&i2c->dev))
memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev), memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment