减短wm8900在resume函数中消耗的时间

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index dc51742593f0c91bcf5828c1b5a6b354d9340dec..c072134b314b44172aeb073ff5a469d3748c363b 100755 (executable)
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -156,6 +156,7 @@
 #define WM8900_WORK_POWERDOWN_PLAYBACK 1
 #define WM8900_WORK_POWERDOWN_CAPTURE  2
 #define WM8900_WORK_POWERDOWN_PLAYBACK_CAPTURE 3
+#define WM8900_WORK_HW_SET 4
 
 static void wm8900_work(struct work_struct *work);
 
@@ -268,26 +269,6 @@ static void wm8900_powerdown(void)
        }
 }
 
-static void wm8900_work(struct work_struct *work)
-{
-       WM8900_DBG("Enter::wm8900_work : wm8900_work_type = %d\n", wm8900_work_type);
-
-       switch (wm8900_work_type) {
-       case WM8900_WORK_POWERDOWN_PLAYBACK :
-               break;
-       case WM8900_WORK_POWERDOWN_CAPTURE:
-               snd_soc_write(wm8900_codec, WM8900_REG_POWER1, 0x210D);
-               break;
-       case WM8900_WORK_POWERDOWN_PLAYBACK_CAPTURE:
-               wm8900_powerdown();
-               break;
-       default:
-               break;
-       }
-
-       wm8900_work_type = WM8900_WORK_NULL;
-}
-
 static void wm8900_set_hw(struct snd_soc_codec *codec)
 {
        u16 reg;
@@ -362,6 +343,29 @@ static void wm8900_set_hw(struct snd_soc_codec *codec)
        wm8900_current_status |= WM8900_IS_STARTUP;
 }
 
+static void wm8900_work(struct work_struct *work)
+{
+        WM8900_DBG("Enter::wm8900_work : wm8900_work_type = %d\n", wm8900_work_type);
+
+        switch (wm8900_work_type) {
+        case WM8900_WORK_POWERDOWN_PLAYBACK :
+                break;
+        case WM8900_WORK_POWERDOWN_CAPTURE:
+                snd_soc_write(wm8900_codec, WM8900_REG_POWER1, 0x210D);
+                break;
+        case WM8900_WORK_POWERDOWN_PLAYBACK_CAPTURE:
+                wm8900_powerdown();
+                break;
+        case WM8900_WORK_HW_SET:
+                wm8900_set_hw(wm8900_codec);
+                break;
+        default:
+                break;
+        }
+
+        wm8900_work_type = WM8900_WORK_NULL;
+}
+
 static int wm8900_hw_params(struct snd_pcm_substream *substream,
        struct snd_pcm_hw_params *params,
        struct snd_soc_dai *dai)
@@ -1020,7 +1024,13 @@ static int wm8900_resume(struct platform_device *pdev)
        }
 
 #ifdef WM8900_NO_POWEROFF
-       wm8900_set_hw(codec);
+       if (wm8900_current_status == WM8900_IS_SHUTDOWN) {
+
+               cancel_delayed_work_sync(&delayed_work);
+               wm8900_work_type = WM8900_WORK_HW_SET;
+               queue_delayed_work(wm8900_workq, &delayed_work,
+                                  msecs_to_jiffies(1000));
+       }
 #endif
 
        return 0;