diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-09-27 08:45:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 14:53:38 -0400 |
commit | b6ba8cc287f7dde9302d8b152f8e60cd570ecbc8 (patch) | |
tree | 42194b91521979dc089da64e348726ee0a84edce /sound/soc/codecs/wm9090.c | |
parent | 6e34216490d63a496af8db6f497dbfc251405397 (diff) |
ASoC: Remove unused "control_data" field of struct wm9090_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/codecs/wm9090.c')
-rw-r--r-- | sound/soc/codecs/wm9090.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm9090.c b/sound/soc/codecs/wm9090.c index bd27fc7593cd..228d782ccded 100644 --- a/sound/soc/codecs/wm9090.c +++ b/sound/soc/codecs/wm9090.c | |||
@@ -140,7 +140,6 @@ static const u16 wm9090_reg_defaults[] = { | |||
140 | /* This struct is used to save the context */ | 140 | /* This struct is used to save the context */ |
141 | struct wm9090_priv { | 141 | struct wm9090_priv { |
142 | struct wm9090_platform_data pdata; | 142 | struct wm9090_platform_data pdata; |
143 | void *control_data; | ||
144 | }; | 143 | }; |
145 | 144 | ||
146 | static int wm9090_volatile(struct snd_soc_codec *codec, unsigned int reg) | 145 | 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) | |||
552 | struct wm9090_priv *wm9090 = snd_soc_codec_get_drvdata(codec); | 551 | struct wm9090_priv *wm9090 = snd_soc_codec_get_drvdata(codec); |
553 | int ret; | 552 | int ret; |
554 | 553 | ||
555 | codec->control_data = wm9090->control_data; | ||
556 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); | 554 | ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); |
557 | if (ret != 0) { | 555 | if (ret != 0) { |
558 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 556 | 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, | |||
661 | sizeof(wm9090->pdata)); | 659 | sizeof(wm9090->pdata)); |
662 | 660 | ||
663 | i2c_set_clientdata(i2c, wm9090); | 661 | i2c_set_clientdata(i2c, wm9090); |
664 | wm9090->control_data = i2c; | ||
665 | 662 | ||
666 | ret = snd_soc_register_codec(&i2c->dev, | 663 | ret = snd_soc_register_codec(&i2c->dev, |
667 | &soc_codec_dev_wm9090, NULL, 0); | 664 | &soc_codec_dev_wm9090, NULL, 0); |