qcacld: Clean up Code in resume path

Resume Indication to FW is posted in hif_pci_resume.
Clean code in UMAC during resume for cld

Change-Id: Id47aa00a5dc7bfba628b48265a583a15331d7f99
CRs-Fixed: 633989

3 files changed, 9 insertions, 55 deletions

diff --git a/CORE/HDD/src/wlan_hdd_early_suspend.c b/CORE/HDD/src/wlan_hdd_early_suspend.c
index efe694160e30..8c205097ffa0 100644
--- a/CORE/HDD/src/wlan_hdd_early_suspend.c
+++ b/CORE/HDD/src/wlan_hdd_early_suspend.c
@@ -938,8 +938,11 @@ static void hdd_conf_suspend_ind(hdd_context_t* pHddCtx,
 
 static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter)
 {
-    eHalStatus halStatus = eHAL_STATUS_FAILURE;
     hdd_context_t* pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
+
+#ifndef QCA_WIFI_2_0
+
+    eHalStatus halStatus = eHAL_STATUS_FAILURE;
     tpSirWlanResumeParam wlanResumeParam;
 
     hddLog(VOS_TRACE_LEVEL_INFO,
@@ -962,6 +965,8 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter)
         vos_mem_free(wlanResumeParam);
     }
 
+#endif
+
     /* Disable supported OffLoads */
     hdd_conf_hostoffload(pAdapter, FALSE);
     pHddCtx->hdd_mcastbcast_filter_set = FALSE;
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
index 36b111dba792..c52f802a9820 100644
--- a/CORE/SERVICES/WMA/wma.c
+++ b/CORE/SERVICES/WMA/wma.c
@@ -12823,54 +12823,7 @@ static VOS_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma)
 	return VOS_STATUS_SUCCESS;
 }
 
-/*
- * UMAC sends resume indication request on each vdev. This function
- * performs wow resume when very first resume indication received
- * from umac. wow resume is applicable only if the driver is in
- * wow suspend state.
- */
-static VOS_STATUS wma_resume_req(tp_wma_handle wma, tpSirWlanResumeParam info)
-{
-	struct wma_txrx_node *iface;
-	int8_t vdev_id;
-	VOS_STATUS ret;
-
-	if (!wma->wow.wow_enable || !wma->wow.wow_enable_cmd_sent) {
-		vos_mem_free(info);
-		return VOS_STATUS_SUCCESS;
-	}
-
-	WMA_LOGD("WOW Resume");
-
-	wma->wow.wow_enable = FALSE;
-	wma->wow.wow_enable_cmd_sent = FALSE;
-
-	for (vdev_id = 0; vdev_id < wma->max_bssid; vdev_id++) {
-		if (!wma->interfaces[vdev_id].handle)
-			continue;
-
-#ifdef QCA_SUPPORT_TXRX_VDEV_PAUSE_LL
-		/* When host resume, by default, unpause all active vdev */
-		if (wma->interfaces[vdev_id].pause_bitmap) {
-			wdi_in_vdev_unpause(wma->interfaces[vdev_id].handle);
-			wma->interfaces[vdev_id].pause_bitmap = 0;
-		}
-#endif /* QCA_SUPPORT_TXRX_VDEV_PAUSE_LL */
-
-		iface = &wma->interfaces[vdev_id];
-		iface->conn_state = FALSE;
-	}
-
-	ret = wma_send_host_wakeup_ind_to_fw(wma);
-	vos_mem_free(info);
-	vos_wake_lock_timeout_acquire(&wma->wow_wake_lock, 2000);
-
-	return ret;
-}
-
-/*
-	 Disable wow in PCIe resume context.
-*/
+/* Disable wow in PCIe resume context.*/
 
 int wma_disable_wow_in_fw(WMA_HANDLE handle)
 {
@@ -15445,10 +15398,6 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg)
 			wma_suspend_req(wma_handle,
 					(tpSirWlanSuspendParam)msg->bodyptr);
 			break;
-		case WDA_WLAN_RESUME_REQ:
-			wma_resume_req(wma_handle,
-				       (tpSirWlanResumeParam)msg->bodyptr);
-			break;
 		case WDA_8023_MULTICAST_LIST_REQ:
 			wma_process_mcbc_set_filter_req(wma_handle,
 				       (tpSirRcvFltMcAddrList)msg->bodyptr);
diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
index 0290a29a1dbd..6ea5fe36cb21 100644
--- a/CORE/SERVICES/WMI/wmi_unified.c
+++ b/CORE/SERVICES/WMI/wmi_unified.c
@@ -890,8 +890,8 @@ int wmi_is_suspend_ready(wmi_unified_t wmi_handle)
 		wmi_pending_cmds = wmi_get_pending_cmds(wmi_handle);
 
 		if (i > WMI_EMPTY_HTC_QUEUE_MAX_RETRY) {
-			pr_err("Host has Pending cmds to send. Fail to suspend:%d ;"
-				"available_host_credits:%d\n", wmi_pending_cmds,
+			pr_err("Host has Pending cmds to send:%d.Fail to suspend."
+				"Available_host_credits:%d\n", wmi_pending_cmds,
 						wmi_get_host_credits(wmi_handle));
 			VOS_ASSERT(0);
 			return -1;