From fb1c53bd7b051f118d7ac97f9f61d7937f264288 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 28 Sep 2011 10:11:54 +0800 Subject: [PATCH] --- yaml --- r: 270695 b: refs/heads/master c: 6d4f7097df481977d191cad85203fcf1ae3df8cf h: refs/heads/master i: 270693: dd6d94006ef16d3509d08516b9a3e38e03b8dfc6 270691: 744ed847479f5a6a44f9be044aa7bb126567f847 270687: d3732e8a8bea124b800959ef54ea41e7a3c6b763 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/cs42l51.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 5087aa25d966..37bfb97ebce3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 217069ea9a0ce579118f8a193f3534c8102d5ca8 +refs/heads/master: 6d4f7097df481977d191cad85203fcf1ae3df8cf diff --git a/trunk/sound/soc/codecs/cs42l51.c b/trunk/sound/soc/codecs/cs42l51.c index 8fb7070108dd..286878d22b6a 100644 --- a/trunk/sound/soc/codecs/cs42l51.c +++ b/trunk/sound/soc/codecs/cs42l51.c @@ -42,7 +42,6 @@ enum master_slave_mode { struct cs42l51_private { enum snd_soc_control_type control_type; - void *control_data; unsigned int mclk; unsigned int audio_mode; /* The mode (I2S or left-justified) */ enum master_slave_mode func; @@ -57,7 +56,7 @@ struct cs42l51_private { static int cs42l51_fill_cache(struct snd_soc_codec *codec) { u8 *cache = codec->reg_cache + 1; - struct i2c_client *i2c_client = codec->control_data; + struct i2c_client *i2c_client = to_i2c_client(codec->dev); s32 length; length = i2c_smbus_read_i2c_block_data(i2c_client, @@ -520,8 +519,6 @@ static int cs42l51_probe(struct snd_soc_codec *codec) struct snd_soc_dapm_context *dapm = &codec->dapm; int ret, reg; - codec->control_data = cs42l51->control_data; - ret = cs42l51_fill_cache(codec); if (ret < 0) { dev_err(codec->dev, "failed to fill register cache\n"); @@ -593,7 +590,6 @@ static int cs42l51_i2c_probe(struct i2c_client *i2c_client, } i2c_set_clientdata(i2c_client, cs42l51); - cs42l51->control_data = i2c_client; cs42l51->control_type = SND_SOC_I2C; ret = snd_soc_register_codec(&i2c_client->dev,