Merge branch 'for-2.6.32' into for-2.6.33

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)
         codec->control_data = spi;
         codec->dev = &spi->dev;
 
-        spi->dev.driver_data = wm8988;
+        dev_set_drvdata(&spi->dev, wm8988);
 
         return wm8988_register(wm8988, SND_SOC_SPI);
 }
 
 static int __devexit wm8988_spi_remove(struct spi_device *spi)
 {
-        struct wm8988_priv *wm8988 = spi->dev.driver_data;
+        struct wm8988_priv *wm8988 = dev_get_drvdata(&spi->dev);
 
         wm8988_unregister(wm8988);
 
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,
                        - wm9081->fs);
         for (i = 1; i < ARRAY_SIZE(clk_sys_rates); i++) {
                 cur_val = abs((wm9081->sysclk_rate /
-                               clk_sys_rates[i].ratio) - wm9081->fs);;
+                               clk_sys_rates[i].ratio) - wm9081->fs);
                 if (cur_val < best_val) {
                         best = i;
                         best_val = cur_val;