From 87bb7e49a38152b99c365c432823724eeabfe162 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 13 Nov 2011 11:56:28 +0800 Subject: [PATCH] --- yaml --- r: 283723 b: refs/heads/master c: 6662ff5c3b8efe8c107118d9506ad65daf3e3a1b h: refs/heads/master i: 283721: a292751bd9b934d2bda19fb0839e5b72853271dd 283719: af418d77d24e295ab21fd4c6175f744267aa66f0 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/alc5632.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 14611e992f7d..81f46392d358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fb5eac50d66cab4a41177269432ffffcc3e67ac +refs/heads/master: 6662ff5c3b8efe8c107118d9506ad65daf3e3a1b diff --git a/trunk/sound/soc/codecs/alc5632.c b/trunk/sound/soc/codecs/alc5632.c index 8a3bf7194728..07e958aeea5c 100644 --- a/trunk/sound/soc/codecs/alc5632.c +++ b/trunk/sound/soc/codecs/alc5632.c @@ -68,8 +68,6 @@ static const u16 alc5632_reg_defaults[] = { /* codec private data */ struct alc5632_priv { enum snd_soc_control_type control_type; - void *control_data; - struct mutex mutex; u8 id; unsigned int sysclk; }; @@ -1071,9 +1069,7 @@ static int alc5632_i2c_probe(struct i2c_client *client, } i2c_set_clientdata(client, alc5632); - alc5632->control_data = client; alc5632->control_type = SND_SOC_I2C; - mutex_init(&alc5632->mutex); ret = snd_soc_register_codec(&client->dev, &soc_codec_device_alc5632, &alc5632_dai, 1);