lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: Remove unused "control_data" field of struct wm9090_priv

Browse Source 
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>
This commit is contained in:
Axel Lin
2011-09-27 20:45:17 +08:00
committed by Mark Brown
parent 6e34216490
commit b6ba8cc287
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/wm9090.c
View File

@@ -140,7 +140,6 @@ static const u16 wm9090_reg_defaults[] = {
/* This struct is used to save the context */ /* This struct is used to save the context */
struct wm9090_priv { struct wm9090_priv {
struct wm9090_platform_data pdata; struct wm9090_platform_data pdata;
void *control_data;
}; };
static int wm9090_volatile(struct snd_soc_codec *codec, unsigned int reg) static int wm9090_volatile(struct snd_soc_codec *codec, unsigned int reg)
@@ -552,7 +551,6 @@ static int wm9090_probe(struct snd_soc_codec *codec)
struct wm9090_priv *wm9090 = snd_soc_codec_get_drvdata(codec); struct wm9090_priv *wm9090 = snd_soc_codec_get_drvdata(codec);
int ret; int ret;
codec->control_data = wm9090->control_data;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -661,7 +659,6 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,
sizeof(wm9090->pdata)); sizeof(wm9090->pdata));
i2c_set_clientdata(i2c, wm9090); i2c_set_clientdata(i2c, wm9090);
wm9090->control_data = i2c;
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm9090, NULL, 0); &soc_codec_dev_wm9090, NULL, 0);