diff --git a/core/sme/inc/csr_internal.h b/core/sme/inc/csr_internal.h
index f4d0138d7e9b..182129eccc43 100644
--- a/core/sme/inc/csr_internal.h
+++ b/core/sme/inc/csr_internal.h
@@ -1069,10 +1069,6 @@ static inline void csr_roaming_report_diag_event(
 bool csr_find_session_by_bssid(struct mac_context *mac_ctx, uint8_t *bssid);
 QDF_STATUS csr_get_channels_and_power(struct mac_context *mac);
 
-void csr_nonscan_pending_ll_unlock(struct mac_context *mac_ctx);
-void csr_nonscan_active_ll_unlock(struct mac_context *mac_ctx);
-void csr_nonscan_pending_ll_lock(struct mac_context *mac_ctx);
-void csr_nonscan_active_ll_lock(struct mac_context *mac_ctx);
 bool csr_nonscan_active_ll_is_list_empty(
 			struct mac_context *mac_ctx,
 			bool inter_locked);
@@ -1096,17 +1092,8 @@ tListElem *csr_nonscan_pending_ll_remove_head(
 			bool inter_locked);
 uint32_t csr_nonscan_pending_ll_count(
 			struct mac_context *mac_ctx);
-void csr_nonscan_pending_ll_insert_head(
-			struct mac_context *mac_ctx,
-		tListElem *entry, bool inter_locked);
-void csr_nonscan_pending_ll_insert_tail(
-			struct mac_context *mac_ctx,
-		tListElem *entry, bool inter_locked);
 uint32_t csr_nonscan_active_ll_count(
 			struct mac_context *mac_ctx);
-void csr_nonscan_active_ll_insert_head(
-			struct mac_context *mac_ctx,
-		tListElem *entry, bool inter_locked);
 tListElem *csr_nonscan_pending_ll_next(
 			struct mac_context *mac_ctx,
 		tListElem *entry, bool inter_locked);
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 092db00219f3..c88c3bececcf 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -428,7 +428,6 @@ tSmeCmd *sme_get_command_buffer(struct mac_context *mac)
 		} /* if(pTempCmd) */
 
 		/* dump what is in the pending queue */
-		csr_nonscan_pending_ll_lock(mac);
 		pEntry =
 			csr_nonscan_pending_ll_peek_head(mac,
 					 LL_ACCESS_NOLOCK);
@@ -447,7 +446,6 @@ tSmeCmd *sme_get_command_buffer(struct mac_context *mac)
 			pEntry = csr_nonscan_pending_ll_next(mac, pEntry,
 					    LL_ACCESS_NOLOCK);
 		}
-		csr_nonscan_pending_ll_unlock(mac);
 
 		if (mac->mlme_cfg->gen.fatal_event_trigger)
 			cds_flush_logs(WLAN_LOG_TYPE_FATAL,
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 2e47a7edd432..abe87ebb7896 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -2999,7 +2999,6 @@ static void csr_roam_remove_duplicate_pending_cmd_from_list(
 		sme_err("failed to open list");
 		return;
 	}
-	csr_nonscan_pending_ll_lock(mac_ctx);
 	entry = csr_nonscan_pending_ll_peek_head(mac_ctx, LL_ACCESS_NOLOCK);
 	while (entry) {
 		next_entry = csr_nonscan_pending_ll_next(mac_ctx, entry,
@@ -3044,7 +3043,6 @@ static void csr_roam_remove_duplicate_pending_cmd_from_list(
 		}
 		entry = next_entry;
 	}
-	csr_nonscan_pending_ll_unlock(mac_ctx);
 
 	while ((entry = csr_ll_remove_head(&local_list, LL_ACCESS_NOLOCK))) {
 		dup_cmd = GET_BASE_ADDR(entry, tSmeCmd, Link);
@@ -3074,11 +3072,8 @@ void csr_roam_remove_duplicate_command(struct mac_context *mac_ctx,
 			uint32_t session_id, tSmeCmd *command,
 			enum csr_roam_reason roam_reason)
 {
-	/* Always lock active list before locking pending lists */
-	csr_nonscan_active_ll_lock(mac_ctx);
 	csr_roam_remove_duplicate_pending_cmd_from_list(mac_ctx,
 		session_id, command, roam_reason);
-	csr_nonscan_active_ll_unlock(mac_ctx);
 }
 
 /**
@@ -8524,7 +8519,6 @@ bool is_disconnect_pending(struct mac_context *pmac,
 	tSmeCmd *command = NULL;
 	bool disconnect_cmd_exist = false;
 
-	csr_nonscan_pending_ll_lock(pmac);
 	entry = csr_nonscan_pending_ll_peek_head(pmac, LL_ACCESS_NOLOCK);
 	while (entry) {
 		next_entry = csr_nonscan_pending_ll_next(pmac,
@@ -8538,7 +8532,7 @@ bool is_disconnect_pending(struct mac_context *pmac,
 		}
 		entry = next_entry;
 	}
-	csr_nonscan_pending_ll_unlock(pmac);
+
 	return disconnect_cmd_exist;
 }
 
@@ -8763,8 +8757,6 @@ bool csr_is_roam_command_waiting_for_session(struct mac_context *mac,
 	tListElem *pEntry;
 	tSmeCmd *pCommand = NULL;
 
-	/* alwasy lock active list before locking pending list */
-	csr_nonscan_active_ll_lock(mac);
 	pEntry = csr_nonscan_active_ll_peek_head(mac, LL_ACCESS_NOLOCK);
 	if (pEntry) {
 		pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
@@ -8774,7 +8766,6 @@ bool csr_is_roam_command_waiting_for_session(struct mac_context *mac,
 		}
 	}
 	if (false == fRet) {
-		csr_nonscan_pending_ll_lock(mac);
 		pEntry = csr_nonscan_pending_ll_peek_head(mac,
 					 LL_ACCESS_NOLOCK);
 		while (pEntry) {
@@ -8787,9 +8778,7 @@ bool csr_is_roam_command_waiting_for_session(struct mac_context *mac,
 			pEntry = csr_nonscan_pending_ll_next(mac, pEntry,
 							LL_ACCESS_NOLOCK);
 		}
-		csr_nonscan_pending_ll_unlock(mac);
 	}
-	csr_nonscan_active_ll_unlock(mac);
 
 	return fRet;
 }
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index 14edf5c0bc2b..a217aa55f103 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -83,16 +83,12 @@ static QDF_STATUS csr_ll_scan_purge_result(struct mac_context *mac,
 	tListElem *pEntry;
 	struct tag_csrscan_result *pBssDesc;
 
-	csr_ll_lock(pList);
-
 	while ((pEntry = csr_ll_remove_head(pList, LL_ACCESS_NOLOCK)) != NULL) {
 		pBssDesc = GET_BASE_ADDR(pEntry, struct tag_csrscan_result,
 					Link);
 		csr_free_scan_result_entry(mac, pBssDesc);
 	}
 
-	csr_ll_unlock(pList);
-
 	return status;
 }
 
@@ -508,7 +504,6 @@ static void csr_purge_channel_power(struct mac_context *mac,
 	struct csr_channel_powerinfo *pChannelSet;
 	tListElem *pEntry;
 
-	csr_ll_lock(pChannelList);
 	/*
 	 * Remove the channel sets from the learned list and put them
 	 * in the free list
@@ -520,7 +515,6 @@ static void csr_purge_channel_power(struct mac_context *mac,
 		if (pChannelSet)
 			qdf_mem_free(pChannelSet);
 	}
-	csr_ll_unlock(pChannelList);
 }
 
 /*
@@ -1296,7 +1290,6 @@ tCsrScanResultInfo *csr_scan_result_get_first(struct mac_context *mac,
 				(struct scan_result_list *) hScanResult;
 
 	if (pResultList) {
-		csr_ll_lock(&pResultList->List);
 		pEntry = csr_ll_peek_head(&pResultList->List, LL_ACCESS_NOLOCK);
 		if (pEntry) {
 			pResult = GET_BASE_ADDR(pEntry, struct
@@ -1304,7 +1297,6 @@ tCsrScanResultInfo *csr_scan_result_get_first(struct mac_context *mac,
 			pRet = &pResult->Result;
 		}
 		pResultList->pCurEntry = pEntry;
-		csr_ll_unlock(&pResultList->List);
 	}
 
 	return pRet;
@@ -1322,7 +1314,6 @@ tCsrScanResultInfo *csr_scan_result_get_next(struct mac_context *mac,
 	if (!pResultList)
 		return NULL;
 
-	csr_ll_lock(&pResultList->List);
 	if (NULL == pResultList->pCurEntry)
 		pEntry = csr_ll_peek_head(&pResultList->List, LL_ACCESS_NOLOCK);
 	else
@@ -1335,7 +1326,7 @@ tCsrScanResultInfo *csr_scan_result_get_next(struct mac_context *mac,
 		pRet = &pResult->Result;
 	}
 	pResultList->pCurEntry = pEntry;
-	csr_ll_unlock(&pResultList->List);
+
 	return pRet;
 }
 
@@ -1736,7 +1727,6 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(struct mac_context *mac,
 		return status;
 	}
 
-	csr_nonscan_pending_ll_lock(mac);
 	pEntry = csr_nonscan_pending_ll_peek_head(mac, LL_ACCESS_NOLOCK);
 
 	/*
@@ -1757,7 +1747,7 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(struct mac_context *mac,
 			status = QDF_STATUS_SUCCESS;
 		}
 	}
-	csr_nonscan_pending_ll_unlock(mac);
+
 
 	while ((pEntry = csr_ll_remove_head(&localList, LL_ACCESS_NOLOCK))) {
 		pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link);
@@ -2805,8 +2795,6 @@ static void csr_filter_ap_due_to_rssi_reject(struct mac_context *mac_ctx,
 	   !qdf_list_size(&mac_ctx->roam.rssi_disallow_bssid))
 		return;
 
-	csr_ll_lock(&scan_list->List);
-
 	cur_entry = csr_ll_peek_head(&scan_list->List, LL_ACCESS_NOLOCK);
 	while (cur_entry) {
 		scan_res = GET_BASE_ADDR(cur_entry, struct tag_csrscan_result,
@@ -2824,8 +2812,6 @@ static void csr_filter_ap_due_to_rssi_reject(struct mac_context *mac_ctx,
 		cur_entry = next_entry;
 		next_entry = NULL;
 	}
-	csr_ll_unlock(&scan_list->List);
-
 }
 
 QDF_STATUS csr_scan_get_result(struct mac_context *mac_ctx,
@@ -3073,7 +3059,6 @@ void csr_init_occupied_channels_list(struct mac_context *mac_ctx,
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			return;
 	scan_list = results;
-	csr_ll_lock(&scan_list->List);
 	scan_entry = csr_ll_peek_head(&scan_list->List, LL_ACCESS_NOLOCK);
 	while (scan_entry) {
 		bss_desc = GET_BASE_ADDR(scan_entry, struct tag_csrscan_result,
@@ -3099,7 +3084,6 @@ void csr_init_occupied_channels_list(struct mac_context *mac_ctx,
 		scan_entry = csr_ll_next(&scan_list->List, scan_entry,
 				     LL_ACCESS_NOLOCK);
 	}
-	csr_ll_unlock(&scan_list->List);
 
 	csr_scan_result_purge(mac_ctx, scan_list);
 }
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index ca00af3bf92f..8faa485d807e 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -433,37 +433,6 @@ void csr_purge_pdev_all_ser_cmd_list(struct mac_context *mac_ctx)
 					  true, true, true);
 }
 
-void csr_nonscan_active_ll_insert_head(struct mac_context *mac_ctx,
-				       tListElem *entry, bool inter_locked)
-{
-}
-
-void csr_nonscan_pending_ll_insert_head(struct mac_context *mac_ctx,
-					tListElem *entry, bool inter_locked)
-{
-}
-
-void csr_nonscan_pending_ll_insert_tail(struct mac_context *mac_ctx,
-					tListElem *entry, bool inter_locked)
-{
-}
-
-void csr_nonscan_pending_ll_unlock(struct mac_context *mac_ctx)
-{
-}
-
-void csr_nonscan_active_ll_unlock(struct mac_context *mac_ctx)
-{
-}
-
-void csr_nonscan_pending_ll_lock(struct mac_context *mac_ctx)
-{
-}
-
-void csr_nonscan_active_ll_lock(struct mac_context *mac_ctx)
-{
-}
-
 uint32_t csr_nonscan_active_ll_count(struct mac_context *mac_ctx)
 {
 	return wlan_serialization_get_active_list_count(mac_ctx->psoc, false);