From 728be356909f307a63f89d3c7328dc3c3f07ff74 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 28 Sep 2011 10:12:48 +0800 Subject: [PATCH] --- yaml --- r: 270696 b: refs/heads/master c: 72a921da070c9d7b5ac527ee20d80826100f0138 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/max98088.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 37bfb97ebce3..d7a78d88de11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d4f7097df481977d191cad85203fcf1ae3df8cf +refs/heads/master: 72a921da070c9d7b5ac527ee20d80826100f0138 diff --git a/trunk/sound/soc/codecs/max98088.c b/trunk/sound/soc/codecs/max98088.c index ac65a2d36408..587043b6f79f 100644 --- a/trunk/sound/soc/codecs/max98088.c +++ b/trunk/sound/soc/codecs/max98088.c @@ -40,7 +40,6 @@ struct max98088_cdata { struct max98088_priv { enum max98088_type devtype; - void *control_data; struct max98088_pdata *pdata; unsigned int sysclk; struct max98088_cdata dai[2]; @@ -2066,7 +2065,6 @@ static int max98088_i2c_probe(struct i2c_client *i2c, max98088->devtype = id->driver_data; i2c_set_clientdata(i2c, max98088); - max98088->control_data = i2c; max98088->pdata = i2c->dev.platform_data; ret = snd_soc_register_codec(&i2c->dev,