diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-09-27 08:43:24 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-27 14:53:38 -0400 |
commit | 8c0c459ced458b19a589b3a31e5c1231bd1b887a (patch) | |
tree | 73ffded4db6b3cbabaa1ae793d6edf0788e32294 /sound/soc/codecs/wm8978.c | |
parent | ec61bde573a9eec829a04822454ab4818f2f79b3 (diff) |
ASoC: Remove unused "control_data" field of struct wm8978_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/wm8978.c')
-rw-r--r-- | sound/soc/codecs/wm8978.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index 85e3e630e763..41ca4d9ac20c 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c | |||
@@ -52,7 +52,6 @@ static const u16 wm8978_reg[WM8978_CACHEREGNUM] = { | |||
52 | /* codec private data */ | 52 | /* codec private data */ |
53 | struct wm8978_priv { | 53 | struct wm8978_priv { |
54 | enum snd_soc_control_type control_type; | 54 | enum snd_soc_control_type control_type; |
55 | void *control_data; | ||
56 | unsigned int f_pllout; | 55 | unsigned int f_pllout; |
57 | unsigned int f_mclk; | 56 | unsigned int f_mclk; |
58 | unsigned int f_256fs; | 57 | unsigned int f_256fs; |
@@ -955,7 +954,6 @@ static int wm8978_probe(struct snd_soc_codec *codec) | |||
955 | * default hardware setting | 954 | * default hardware setting |
956 | */ | 955 | */ |
957 | wm8978->sysclk = WM8978_PLL; | 956 | wm8978->sysclk = WM8978_PLL; |
958 | codec->control_data = wm8978->control_data; | ||
959 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C); | 957 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, SND_SOC_I2C); |
960 | if (ret < 0) { | 958 | if (ret < 0) { |
961 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 959 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -1016,7 +1014,6 @@ static __devinit int wm8978_i2c_probe(struct i2c_client *i2c, | |||
1016 | return -ENOMEM; | 1014 | return -ENOMEM; |
1017 | 1015 | ||
1018 | i2c_set_clientdata(i2c, wm8978); | 1016 | i2c_set_clientdata(i2c, wm8978); |
1019 | wm8978->control_data = i2c; | ||
1020 | 1017 | ||
1021 | ret = snd_soc_register_codec(&i2c->dev, | 1018 | ret = snd_soc_register_codec(&i2c->dev, |
1022 | &soc_codec_dev_wm8978, &wm8978_dai, 1); | 1019 | &soc_codec_dev_wm8978, &wm8978_dai, 1); |