소스 검색

qcacmn: Remove WLAN_SUSPEND_RESUME_TEST flag for WAKE MSI handler

WAKE MSI can be triggered and handled properly for both unit test
framework and runtime PM feature in runtime, so there is no need
to have a compile time flag. Hence remove it.

Change-Id: I97127575114d6be40b36a7417cc7c177cec69808
CRs-fixed: 2496366
Yue Ma 5 년 전
부모
커밋
fd75cd2948
1개의 변경된 파일6개의 추가작업 그리고 20개의 파일을 삭제
  1. 6 20
      hif/src/hif_main.c

+ 6 - 20
hif/src/hif_main.c

@@ -1249,22 +1249,6 @@ void hif_ramdump_handler(struct hif_opaque_softc *scn)
 		hif_usb_ramdump_handler(scn);
 		hif_usb_ramdump_handler(scn);
 }
 }
 
 
-#ifdef WLAN_SUSPEND_RESUME_TEST
-irqreturn_t hif_wake_interrupt_handler(int irq, void *context)
-{
-	struct hif_softc *scn = context;
-
-	HIF_INFO("wake interrupt received on irq %d", irq);
-
-	if (scn->initial_wakeup_cb)
-		scn->initial_wakeup_cb(scn->initial_wakeup_priv);
-
-	if (hif_is_ut_suspended(scn))
-		hif_ut_fw_resume(scn);
-
-	return IRQ_HANDLED;
-}
-#else /* WLAN_SUSPEND_RESUME_TEST */
 irqreturn_t hif_wake_interrupt_handler(int irq, void *context)
 irqreturn_t hif_wake_interrupt_handler(int irq, void *context)
 {
 {
 	struct hif_softc *scn = context;
 	struct hif_softc *scn = context;
@@ -1272,18 +1256,20 @@ irqreturn_t hif_wake_interrupt_handler(int irq, void *context)
 
 
 	HIF_INFO("wake interrupt received on irq %d", irq);
 	HIF_INFO("wake interrupt received on irq %d", irq);
 
 
-	if (scn->initial_wakeup_cb)
-		scn->initial_wakeup_cb(scn->initial_wakeup_priv);
-
 	if (hif_pm_runtime_get_monitor_wake_intr(hif_ctx) &&
 	if (hif_pm_runtime_get_monitor_wake_intr(hif_ctx) &&
 	    hif_pm_runtime_is_suspended(hif_ctx)) {
 	    hif_pm_runtime_is_suspended(hif_ctx)) {
 		hif_pm_runtime_set_monitor_wake_intr(hif_ctx, 0);
 		hif_pm_runtime_set_monitor_wake_intr(hif_ctx, 0);
 		hif_pm_runtime_request_resume(hif_ctx);
 		hif_pm_runtime_request_resume(hif_ctx);
 	}
 	}
 
 
+	if (scn->initial_wakeup_cb)
+		scn->initial_wakeup_cb(scn->initial_wakeup_priv);
+
+	if (hif_is_ut_suspended(scn))
+		hif_ut_fw_resume(scn);
+
 	return IRQ_HANDLED;
 	return IRQ_HANDLED;
 }
 }
-#endif /* WLAN_SUSPEND_RESUME_TEST */
 
 
 void hif_set_initial_wakeup_cb(struct hif_opaque_softc *hif_ctx,
 void hif_set_initial_wakeup_cb(struct hif_opaque_softc *hif_ctx,
 			       void (*callback)(void *),
 			       void (*callback)(void *),