Merge branch 'for-3.2' into for-3.3

[deliverable/linux.git] / sound / soc / codecs / wm8711.c

diff --git a/sound/soc/codecs/wm8711.c b/sound/soc/codecs/wm8711.c
index a6f1e391314df7d2a4fff1cfba0992054078fe35..0b76d1dca5eade12cfd3bfd640a665e1f0626b97 100644 (file)
--- a/sound/soc/codecs/wm8711.c
+++ b/sound/soc/codecs/wm8711.c
@@ -18,7 +18,6 @@
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
-#include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
@@ -339,7 +338,7 @@ static struct snd_soc_dai_driver wm8711_dai = {
        .ops = &wm8711_ops,
 };
 
-static int wm8711_suspend(struct snd_soc_codec *codec, pm_message_t state)
+static int wm8711_suspend(struct snd_soc_codec *codec)
 {
        snd_soc_write(codec, WM8711_ACTIVE, 0x0);
        wm8711_set_bias_level(codec, SND_SOC_BIAS_OFF);
@@ -375,9 +374,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)
        snd_soc_update_bits(codec, WM8711_LOUT1V, 0x0100, 0x0100);
        snd_soc_update_bits(codec, WM8711_ROUT1V, 0x0100, 0x0100);
 
-       snd_soc_add_controls(codec, wm8711_snd_controls,
-                            ARRAY_SIZE(wm8711_snd_controls));
-
        return ret;
 
 }
@@ -398,6 +394,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = {
        .reg_cache_size = ARRAY_SIZE(wm8711_reg),
        .reg_word_size = sizeof(u16),
        .reg_cache_default = wm8711_reg,
+       .controls = wm8711_snd_controls,
+       .num_controls = ARRAY_SIZE(wm8711_snd_controls),
        .dapm_widgets = wm8711_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(wm8711_dapm_widgets),
        .dapm_routes = wm8711_intercon,