From ebcccb30e4d0e5d3853c214deffd070273aee0f5 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Mon, 17 Dec 2018 18:27:35 -0800
Subject: [PATCH] qcacld-3.0: Remove PE Global Lock infrastructure

Change I64d0b71853004679ae694bcd6ca7a2f2347adc84 ("qcacld-3.0: Remove
legacy P2P codes in MAC") removed the client of the PE Global Lock
Infrastucture. Since this is no longer used, remove it.

Change-Id: I71a7d98667eb779c1f62cc9d02a877814ad1d7a0
CRs-Fixed: 2370877
---
 core/mac/inc/ani_global.h     |  1 -
 core/mac/inc/mac_trace.h      |  2 --
 core/mac/src/pe/lim/lim_api.c | 39 +----------------------------------
 3 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index f8a6e9e63b24..6343c8a3921b 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -525,7 +525,6 @@ typedef struct sAniSirLim {
 
 	/* admission control policy information */
 	tLimAdmitPolicyInfo admitPolicyInfo;
-	qdf_mutex_t lkPeGlobalLock;
 #ifdef FEATURE_WLAN_TDLS
 	uint8_t gLimTDLSBufStaEnabled;
 	uint8_t gLimTDLSUapsdMask;
diff --git a/core/mac/inc/mac_trace.h b/core/mac/inc/mac_trace.h
index 16140d8a9cb0..e5d09e901533 100644
--- a/core/mac/inc/mac_trace.h
+++ b/core/mac/inc/mac_trace.h
@@ -50,8 +50,6 @@ uint8_t *mac_trace_get_info_log_string(uint16_t infoLog);
 
 #endif
 uint8_t *mac_trace_get_wma_msg_string(uint16_t wmaMsg);
-QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe);
-QDF_STATUS pe_release_global_lock(tAniSirLim *psPe);
 uint8_t *mac_trace_get_neighbour_roam_state(uint16_t neighbourRoamState);
 uint8_t *mac_trace_getcsr_roam_state(uint16_t csr_roamState);
 uint8_t *mac_trace_getcsr_roam_sub_state(uint16_t csr_roamSubState);
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index 8791c849ea1b..d72f952f15a0 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -421,12 +421,6 @@ QDF_STATUS lim_initialize(struct mac_context *mac)
 	mac->lim.deauthMsgCnt = 0;
 	mac->lim.disassocMsgCnt = 0;
 
-	if (QDF_IS_STATUS_ERROR(qdf_mutex_create(
-			&mac->lim.lkPeGlobalLock))) {
-		pe_err("lim lock init failed!");
-		return QDF_STATUS_E_FAILURE;
-	}
-
 	__lim_init_assoc_vars(mac);
 	__lim_init_vars(mac);
 	__lim_init_states(mac);
@@ -441,9 +435,8 @@ QDF_STATUS lim_initialize(struct mac_context *mac)
 	rrm_initialize(mac);
 
 	if (QDF_IS_STATUS_ERROR(qdf_mutex_create(
-		&mac->lim.lim_frame_register_lock))) {
+					&mac->lim.lim_frame_register_lock))) {
 		pe_err("lim lock init failed!");
-		qdf_mutex_destroy(&mac->lim.lkPeGlobalLock);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -888,10 +881,6 @@ QDF_STATUS pe_close(struct mac_context *mac)
 
 	pe_free_dph_node_array_buffer();
 
-	if (!QDF_IS_STATUS_SUCCESS
-		    (qdf_mutex_destroy(&mac->lim.lkPeGlobalLock))) {
-		return QDF_STATUS_E_FAILURE;
-	}
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -2625,32 +2614,6 @@ void lim_update_lost_link_info(struct mac_context *mac, struct pe_session *sessi
 	lim_sys_process_mmh_msg_api(mac, &mmh_msg, ePROT);
 }
 
-QDF_STATUS pe_acquire_global_lock(tAniSirLim *psPe)
-{
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
-
-	if (psPe) {
-		if (QDF_IS_STATUS_SUCCESS
-			    (qdf_mutex_acquire(&psPe->lkPeGlobalLock))) {
-			status = QDF_STATUS_SUCCESS;
-		}
-	}
-	return status;
-}
-
-QDF_STATUS pe_release_global_lock(tAniSirLim *psPe)
-{
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
-
-	if (psPe) {
-		if (QDF_IS_STATUS_SUCCESS
-			    (qdf_mutex_release(&psPe->lkPeGlobalLock))) {
-			status = QDF_STATUS_SUCCESS;
-		}
-	}
-	return status;
-}
-
 /**
  * lim_mon_init_session() - create PE session for monitor mode operation
  * @mac_ptr: mac pointer