diff options
Diffstat (limited to 'sound/soc/codecs/wm8580.c')
-rw-r--r-- | sound/soc/codecs/wm8580.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index cae58941a32f..39ad46c41e8a 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c | |||
@@ -200,7 +200,6 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = { | |||
200 | /* codec private data */ | 200 | /* codec private data */ |
201 | struct wm8580_priv { | 201 | struct wm8580_priv { |
202 | enum snd_soc_control_type control_type; | 202 | enum snd_soc_control_type control_type; |
203 | void *control_data; | ||
204 | struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES]; | 203 | struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES]; |
205 | u16 reg_cache[WM8580_MAX_REGISTER + 1]; | 204 | u16 reg_cache[WM8580_MAX_REGISTER + 1]; |
206 | struct pll_state a; | 205 | struct pll_state a; |
@@ -778,7 +777,6 @@ static int wm8580_probe(struct snd_soc_codec *codec) | |||
778 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); | 777 | struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); |
779 | int ret = 0,i; | 778 | int ret = 0,i; |
780 | 779 | ||
781 | codec->control_data = wm8580->control_data; | ||
782 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8580->control_type); | 780 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8580->control_type); |
783 | if (ret < 0) { | 781 | if (ret < 0) { |
784 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 782 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -858,7 +856,6 @@ static int wm8580_i2c_probe(struct i2c_client *i2c, | |||
858 | return -ENOMEM; | 856 | return -ENOMEM; |
859 | 857 | ||
860 | i2c_set_clientdata(i2c, wm8580); | 858 | i2c_set_clientdata(i2c, wm8580); |
861 | wm8580->control_data = i2c; | ||
862 | wm8580->control_type = SND_SOC_I2C; | 859 | wm8580->control_type = SND_SOC_I2C; |
863 | 860 | ||
864 | ret = snd_soc_register_codec(&i2c->dev, | 861 | ret = snd_soc_register_codec(&i2c->dev, |