summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-09-28 10:14:05 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-28 13:19:59 +0100
commit63de012f35e4c48881ec14e9ec48ea92719fe3fb (patch)
tree36557fd2c0eaa039666f1fe3ac94faab2b0cccc6 /sound/soc
parent72a921da070c9d7b5ac527ee20d80826100f0138 (diff)
downloadblackbird-obmc-linux-63de012f35e4c48881ec14e9ec48ea92719fe3fb.tar.gz
blackbird-obmc-linux-63de012f35e4c48881ec14e9ec48ea92719fe3fb.zip
ASoC: Remove unused "control_data" field of struct max98095_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>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/max98095.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/max98095.c b/sound/soc/codecs/max98095.c
index 668434d44303..8f8e2555cbed 100644
--- a/sound/soc/codecs/max98095.c
+++ b/sound/soc/codecs/max98095.c
@@ -40,7 +40,6 @@ struct max98095_cdata {
struct max98095_priv {
enum max98095_type devtype;
- void *control_data;
struct max98095_pdata *pdata;
unsigned int sysclk;
struct max98095_cdata dai[3];
@@ -2337,7 +2336,6 @@ static int max98095_i2c_probe(struct i2c_client *i2c,
max98095->devtype = id->driver_data;
i2c_set_clientdata(i2c, max98095);
- max98095->control_data = i2c;
max98095->pdata = i2c->dev.platform_data;
ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_max98095,
OpenPOWER on IntegriCloud