1 files changed, 5 insertions, 41 deletions

diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index 1436b6ce74d1..bb62f4b3d563 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -1,7 +1,7 @@
 /*
  * wm8994.c  --  WM8994 ALSA SoC Audio driver
  *
- * Copyright 2009 Wolfson Microelectronics plc
+ * Copyright 2009-12 Wolfson Microelectronics plc
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
@@ -2967,23 +2967,8 @@ static struct snd_soc_dai_driver wm8994_dai[] = {
 static int wm8994_codec_suspend(struct snd_soc_codec *codec)
 {
         struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);
-        struct wm8994 *control = wm8994->wm8994;
         int i, ret;
 
-        switch (control->type) {
-        case WM8994:
-                snd_soc_update_bits(codec, WM8994_MICBIAS, WM8994_MICD_ENA, 0);
-                break;
-        case WM1811:
-                snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                    WM1811_JACKDET_MODE_MASK, 0);
-                /* Fall through */
-        case WM8958:
-                snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,
-                                    WM8958_MICD_ENA, 0);
-                break;
-        }
-
         for (i = 0; i < ARRAY_SIZE(wm8994->fll); i++) {
                 memcpy(&wm8994->fll_suspend[i], &wm8994->fll[i],
                        sizeof(struct wm8994_fll_config));
@@ -3033,28 +3018,6 @@ static int wm8994_codec_resume(struct snd_soc_codec *codec)
                                  i + 1, ret);
         }
 
-        switch (control->type) {
-        case WM8994:
-                if (wm8994->micdet[0].jack || wm8994->micdet[1].jack)
-                        snd_soc_update_bits(codec, WM8994_MICBIAS,
-                                            WM8994_MICD_ENA, WM8994_MICD_ENA);
-                break;
-        case WM1811:
-                if (wm8994->jackdet && wm8994->jack_cb) {
-                        /* Restart from idle */
-                        snd_soc_update_bits(codec, WM8994_ANTIPOP_2,
-                                            WM1811_JACKDET_MODE_MASK,
-                                            WM1811_JACKDET_MODE_JACK);
-                        break;
-                }
-                break;
-        case WM8958:
-                if (wm8994->jack_cb)
-                        snd_soc_update_bits(codec, WM8958_MIC_DETECT_1,
-                                            WM8958_MICD_ENA, WM8958_MICD_ENA);
-                break;
-        }
-
         return 0;
 }
 #else
@@ -3729,9 +3692,6 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
 
         if (wm8994->pdata && wm8994->pdata->micdet_irq)
                 wm8994->micdet_irq = wm8994->pdata->micdet_irq;
-        else if (wm8994->pdata && wm8994->pdata->irq_base)
-                wm8994->micdet_irq = wm8994->pdata->irq_base +
-                                     WM8994_IRQ_MIC1_DET;
 
         pm_runtime_enable(codec->dev);
         pm_runtime_idle(codec->dev);
@@ -3870,6 +3830,10 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
                                 dev_warn(codec->dev,
                                          "Failed to request Mic detect IRQ: %d\n",
                                          ret);
+                } else {
+                        wm8994_request_irq(wm8994->wm8994, WM8994_IRQ_MIC1_DET,
+                                           wm8958_mic_irq, "Mic detect",
+                                           wm8994);
                 }
         }