aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-09-27 08:44:13 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-27 14:53:38 -0400
commit6e34216490d63a496af8db6f497dbfc251405397 (patch)
tree3892dbb8cf670bd9460357e8160f5c39faca9062
parent8c0c459ced458b19a589b3a31e5c1231bd1b887a (diff)
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: Axel Lin <axel.lin@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm9081.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index f32ab1ee9647..b2d34483a6a4 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -157,7 +157,6 @@ static struct {
157 157
158struct wm9081_priv { 158struct wm9081_priv {
159 enum snd_soc_control_type control_type; 159 enum snd_soc_control_type control_type;
160 void *control_data;
161 int sysclk_source; 160 int sysclk_source;
162 int mclk_rate; 161 int mclk_rate;
163 int sysclk_rate; 162 int sysclk_rate;
@@ -1213,7 +1212,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)
1213 int ret; 1212 int ret;
1214 u16 reg; 1213 u16 reg;
1215 1214
1216 codec->control_data = wm9081->control_data;
1217 ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type); 1215 ret = snd_soc_codec_set_cache_io(codec, 8, 16, wm9081->control_type);
1218 if (ret != 0) { 1216 if (ret != 0) {
1219 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); 1217 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 1328
1331 i2c_set_clientdata(i2c, wm9081); 1329 i2c_set_clientdata(i2c, wm9081);
1332 wm9081->control_type = SND_SOC_I2C; 1330 wm9081->control_type = SND_SOC_I2C;
1333 wm9081->control_data = i2c;
1334 1331
1335 if (dev_get_platdata(&i2c->dev)) 1332 if (dev_get_platdata(&i2c->dev))
1336 memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev), 1333 memcpy(&wm9081->pdata, dev_get_platdata(&i2c->dev),