diff options
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/wm8988.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/wm9081.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8988.c b/sound/soc/codecs/wm8988.c index 1c8653523c8c..3f530f8a972a 100644 --- a/sound/soc/codecs/wm8988.c +++ b/sound/soc/codecs/wm8988.c | |||
@@ -992,14 +992,14 @@ static int __devinit wm8988_spi_probe(struct spi_device *spi) | |||
992 | codec->control_data = spi; | 992 | codec->control_data = spi; |
993 | codec->dev = &spi->dev; | 993 | codec->dev = &spi->dev; |
994 | 994 | ||
995 | spi->dev.driver_data = wm8988; | 995 | dev_set_drvdata(&spi->dev, wm8988); |
996 | 996 | ||
997 | return wm8988_register(wm8988, SND_SOC_SPI); | 997 | return wm8988_register(wm8988, SND_SOC_SPI); |
998 | } | 998 | } |
999 | 999 | ||
1000 | static int __devexit wm8988_spi_remove(struct spi_device *spi) | 1000 | static int __devexit wm8988_spi_remove(struct spi_device *spi) |
1001 | { | 1001 | { |
1002 | struct wm8988_priv *wm8988 = spi->dev.driver_data; | 1002 | struct wm8988_priv *wm8988 = dev_get_drvdata(&spi->dev); |
1003 | 1003 | ||
1004 | wm8988_unregister(wm8988); | 1004 | wm8988_unregister(wm8988); |
1005 | 1005 | ||
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c index c64e55aa63b6..686e5aa97206 100644 --- a/sound/soc/codecs/wm9081.c +++ b/sound/soc/codecs/wm9081.c | |||
@@ -1027,7 +1027,7 @@ static int wm9081_hw_params(struct snd_pcm_substream *substream, | |||
1027 | - wm9081->fs); | 1027 | - wm9081->fs); |
1028 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { | 1028 | for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) { |
1029 | cur_val = abs((wm9081->sysclk_rate / | 1029 | cur_val = abs((wm9081->sysclk_rate / |
1030 | clk_sys_rates[i].ratio) - wm9081->fs);; | 1030 | clk_sys_rates[i].ratio) - wm9081->fs); |
1031 | if (cur_val < best_val) { | 1031 | if (cur_val < best_val) { |
1032 | best = i; | 1032 | best = i; |
1033 | best_val = cur_val; | 1033 | best_val = cur_val; |