From 471d77088ee628afee1c3b5dc72aaa12263d93b0 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 17 Dec 2018 19:23:45 -0800
Subject: [PATCH] qcacld-3.0: Remove eWNI_SME_READY_TO_SUSPEND_IND handling

Change Iba16643adf1cbd997138c740345e40c00c8e81f6 ("qcacld-3.0: Add
Suspend and Resume support in PMO") removed the logic which sent the
eWNI_SME_READY_TO_SUSPEND_IND message. However it left behind the
handler function in SME which will now never be called. Since this
message is now unused, remove the remaining infrastructure that
originally supported this message.

Change-Id: I91ef442eeb3fd0bb6dc3cccd803c77329b0c730f
CRs-Fixed: 2370880
---
 core/mac/inc/ani_global.h                     |  2 --
 core/mac/inc/sir_api.h                        |  5 ---
 core/mac/inc/wni_api.h                        |  1 -
 .../src/sys/legacy/src/utils/src/mac_trace.c  |  1 -
 core/sme/src/common/sme_api.c                 | 36 -------------------
 5 files changed, 45 deletions(-)

diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index 6343c8a3921b..641d073d0ebb 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -809,8 +809,6 @@ struct mac_context {
 	struct csr_scanstruct scan;
 	struct csr_roamstruct roam;
 	tRrmContext rrm;
-	csr_readyToSuspendCallback readyToSuspendCallback;
-	void *readyToSuspendContext;
 	uint8_t isCoalesingInIBSSAllowed;
 	uint8_t lteCoexAntShare;
 	uint8_t beacon_offload;
diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 22eb05d53bcc..3f2e9f4cf670 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -3090,11 +3090,6 @@ typedef struct {
 	tSirPeerInfoRspParams ibssPeerInfoRspParams;
 } tSirIbssGetPeerInfoRspParams, *tpSirIbssGetPeerInfoRspParams;
 
-typedef struct {
-	uint16_t mesgType;
-	uint16_t mesgLen;
-	bool suspended;
-} tSirReadyToSuspendInd, *tpSirReadyToSuspendInd;
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
 typedef struct {
 	uint16_t mesgType;
diff --git a/core/mac/inc/wni_api.h b/core/mac/inc/wni_api.h
index 8d9c318ac613..10b929392131 100644
--- a/core/mac/inc/wni_api.h
+++ b/core/mac/inc/wni_api.h
@@ -147,7 +147,6 @@ enum eWniMsgTypes {
 	eWNI_SME_GET_TSM_STATS_RSP,
 	eWNI_SME_TSM_IE_IND,
 
-	eWNI_SME_READY_TO_SUSPEND_IND,
 	/* DFS EVENTS */
 	eWNI_SME_DFS_RADAR_FOUND,       /* RADAR found indication from DFS */
 	eWNI_SME_CHANNEL_CHANGE_REQ,    /* Channel Change Request from SAP */
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index 802a669ace1a..0b95d78298af 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -330,7 +330,6 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg)
 		CASE_RETURN_STRING(eWNI_SME_GET_TSM_STATS_REQ);
 		CASE_RETURN_STRING(eWNI_SME_GET_TSM_STATS_RSP);
 		CASE_RETURN_STRING(eWNI_SME_TSM_IE_IND);
-		CASE_RETURN_STRING(eWNI_SME_READY_TO_SUSPEND_IND);
 		CASE_RETURN_STRING(eWNI_SME_SET_HW_MODE_REQ);
 		CASE_RETURN_STRING(eWNI_SME_SET_HW_MODE_RESP);
 		CASE_RETURN_STRING(eWNI_SME_HW_MODE_TRANS_IND);
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 04631fbc1c5d..fa92c3b0a1d2 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -1075,34 +1075,6 @@ QDF_STATUS sme_update_roam_params(mac_handle_t mac_handle,
 	return 0;
 }
 
-/**
- * sme_process_ready_to_suspend() -
- * @mac: Global MAC context
- * @pReadyToSuspend: Parameter received along with ready to suspend
- *			    indication from WMA.
- *
- * On getting ready to suspend indication, this function calls
- * callback registered (HDD callbacks) with SME to inform ready
- * to suspend indication.
- *
- * Return: None
- */
-static void sme_process_ready_to_suspend(struct mac_context *mac,
-					 tpSirReadyToSuspendInd pReadyToSuspend)
-{
-	if (NULL == mac) {
-		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
-			  "%s: mac is null", __func__);
-		return;
-	}
-
-	if (NULL != mac->readyToSuspendCallback) {
-		mac->readyToSuspendCallback(mac->readyToSuspendContext,
-					    pReadyToSuspend->suspended);
-		mac->readyToSuspendCallback = NULL;
-	}
-}
-
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
 
 /**
@@ -2082,14 +2054,6 @@ QDF_STATUS sme_process_msg(struct mac_context *mac, struct scheduler_msg *pMsg)
 			sme_err("Empty message for: %d", pMsg->type);
 		}
 		break;
-	case eWNI_SME_READY_TO_SUSPEND_IND:
-		if (pMsg->bodyptr) {
-			sme_process_ready_to_suspend(mac, pMsg->bodyptr);
-			qdf_mem_free(pMsg->bodyptr);
-		} else {
-			sme_err("Empty message for: %d", pMsg->type);
-		}
-		break;
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
 	case eWNI_SME_READY_TO_EXTWOW_IND:
 		if (pMsg->bodyptr) {