diff options
Diffstat (limited to 'sound/soc/codecs/wm8988.c')
-rw-r--r-- | sound/soc/codecs/wm8988.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index ecbffcea71db..d070a58e4f8e 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -53,7 +53,6 @@ static const u16 wm8988_reg[] = { | |||
53 | struct wm8988_priv { | 53 | struct wm8988_priv { |
54 | unsigned int sysclk; | 54 | unsigned int sysclk; |
55 | enum snd_soc_control_type control_type; | 55 | enum snd_soc_control_type control_type; |
56 | void *control_data; | ||
57 | struct snd_pcm_hw_constraint_list *sysclk_constraints; | 56 | struct snd_pcm_hw_constraint_list *sysclk_constraints; |
58 | u16 reg_cache[WM8988_NUM_REG]; | 57 | u16 reg_cache[WM8988_NUM_REG]; |
59 | }; | 58 | }; |
@@ -763,7 +762,6 @@ static int wm8988_probe(struct snd_soc_codec *codec) | |||
763 | int ret = 0; | 762 | int ret = 0; |
764 | u16 reg; | 763 | u16 reg; |
765 | 764 | ||
766 | codec->control_data = wm8988->control_data; | ||
767 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8988->control_type); | 765 | ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8988->control_type); |
768 | if (ret < 0) { | 766 | if (ret < 0) { |
769 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); | 767 | dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); |
@@ -826,7 +824,6 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi) | |||
826 | if (wm8988 == NULL) | 824 | if (wm8988 == NULL) |
827 | return -ENOMEM; | 825 | return -ENOMEM; |
828 | 826 | ||
829 | wm8988->control_data = spi; | ||
830 | wm8988->control_type = SND_SOC_SPI; | 827 | wm8988->control_type = SND_SOC_SPI; |
831 | spi_set_drvdata(spi, wm8988); | 828 | spi_set_drvdata(spi, wm8988); |
832 | 829 | ||
@@ -867,7 +864,6 @@ static __devinit int wm8988_i2c_probe(struct i2c_client *i2c, | |||
867 | return -ENOMEM; | 864 | return -ENOMEM; |
868 | 865 | ||
869 | i2c_set_clientdata(i2c, wm8988); | 866 | i2c_set_clientdata(i2c, wm8988); |
870 | wm8988->control_data = i2c; | ||
871 | wm8988->control_type = SND_SOC_I2C; | 867 | wm8988->control_type = SND_SOC_I2C; |
872 | 868 | ||
873 | ret = snd_soc_register_codec(&i2c->dev, | 869 | ret = snd_soc_register_codec(&i2c->dev, |