ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[sfrench/cifs-2.6.git] / sound / soc / codecs / sn95031.c

diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 2a30eae1881ce66125ff3ceb581b21e630bf0cc8..84ffdebb8a8b9c937c9ffa1323f4de40f2874e81 100644 (file)
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -26,7 +26,9 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/platform_device.h>
+#include <linux/delay.h>
 #include <linux/slab.h>
+
 #include <asm/intel_scu_ipc.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -825,8 +827,6 @@ EXPORT_SYMBOL_GPL(sn95031_jack_detection);
 /* codec registration */
 static int sn95031_codec_probe(struct snd_soc_codec *codec)
 {
-       int ret;
-
        pr_debug("codec_probe called\n");
 
        codec->dapm.bias_level = SND_SOC_BIAS_OFF;
@@ -877,16 +877,7 @@ static int sn95031_codec_probe(struct snd_soc_codec *codec)
        snd_soc_add_controls(codec, sn95031_snd_controls,
                             ARRAY_SIZE(sn95031_snd_controls));
 
-       ret = snd_soc_dapm_new_controls(&codec->dapm, sn95031_dapm_widgets,
-                               ARRAY_SIZE(sn95031_dapm_widgets));
-       if (ret)
-               pr_err("soc_dapm_new_control failed %d", ret);
-       ret = snd_soc_dapm_add_routes(&codec->dapm, sn95031_audio_map,
-                               ARRAY_SIZE(sn95031_audio_map));
-       if (ret)
-               pr_err("soc_dapm_add_routes failed %d", ret);
-
-       return ret;
+       return 0;
 }
 
 static int sn95031_codec_remove(struct snd_soc_codec *codec)
@@ -903,6 +894,10 @@ struct snd_soc_codec_driver sn95031_codec = {
        .read           = sn95031_read,
        .write          = sn95031_write,
        .set_bias_level = sn95031_set_vaud_bias,
+       .dapm_widgets   = sn95031_dapm_widgets,
+       .num_dapm_widgets       = ARRAY_SIZE(sn95031_dapm_widgets),
+       .dapm_routes    = sn95031_audio_map,
+       .num_dapm_routes        = ARRAY_SIZE(sn95031_audio_map),
 };
 
 static int __devinit sn95031_device_probe(struct platform_device *pdev)
@@ -925,7 +920,7 @@ static struct platform_driver sn95031_codec_driver = {
                .owner          = THIS_MODULE,
        },
        .probe          = sn95031_device_probe,
-       .remove         = sn95031_device_remove,
+       .remove         = __devexit_p(sn95031_device_remove),
 };
 
 static int __init sn95031_init(void)