diff --git a/core/mac/inc/ani_global.h b/core/mac/inc/ani_global.h
index 41ba3ff6289b..463d85f23123 100644
--- a/core/mac/inc/ani_global.h
+++ b/core/mac/inc/ani_global.h
@@ -764,7 +764,7 @@ struct mac_context {
 	/* PAL/HDD handle */
 	hdd_handle_t hdd_handle;
 
-	tSmeStruct sme;
+	struct sme_context sme;
 	tSapStruct sap;
 	struct csr_scanstruct scan;
 	struct csr_roamstruct roam;
diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h
index 9f262da1f9f6..f3d3a76de8f4 100644
--- a/core/sme/inc/sme_inside.h
+++ b/core/sme/inc/sme_inside.h
@@ -160,8 +160,8 @@ QDF_STATUS csr_roam_send_set_key_cmd(struct mac_context *mac_ctx,
 		uint32_t session_id, struct setkey_cmd *set_key_cmd);
 QDF_STATUS csr_is_valid_channel(struct mac_context *mac, uint8_t chnNum);
 
-QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme);
-QDF_STATUS sme_release_global_lock(tSmeStruct *psSme);
+QDF_STATUS sme_acquire_global_lock(struct sme_context *sme);
+QDF_STATUS sme_release_global_lock(struct sme_context *sme);
 
 QDF_STATUS csr_process_add_sta_session_rsp(struct mac_context *mac, uint8_t *pMsg);
 QDF_STATUS csr_process_del_sta_session_rsp(struct mac_context *mac, uint8_t *pMsg);
diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h
index 41d8439aaa72..688faa836d78 100644
--- a/core/sme/inc/sme_internal.h
+++ b/core/sme/inc/sme_internal.h
@@ -251,7 +251,7 @@ typedef void (*hidden_ssid_cb)(hdd_handle_t hdd_handle,
 typedef QDF_STATUS (*md_host_evt_cb)(void *hdd_ctx, struct sir_md_evt *event);
 #endif /* WLAN_FEATURE_MOTION_DETECTION */
 
-typedef struct tagSmeStruct {
+struct sme_context {
 	eSmeState state;
 	qdf_mutex_t lkSmeGlobalLock;
 	uint32_t totalSmeCmd;
@@ -344,6 +344,6 @@ typedef struct tagSmeStruct {
 	/* hidden ssid rsp callback */
 	hidden_ssid_cb hidden_ssid_cb;
 
-} tSmeStruct, *tpSmeStruct;
+};
 
 #endif /* #if !defined( __SMEINTERNAL_H ) */
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index a0e63927a955..c37b5a3bb50f 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -77,30 +77,20 @@ static QDF_STATUS sme_stats_ext_event(struct mac_context *mac,
 				      struct stats_ext_event *msg);
 
 /* Internal SME APIs */
-QDF_STATUS sme_acquire_global_lock(tSmeStruct *psSme)
+QDF_STATUS sme_acquire_global_lock(struct sme_context *sme)
 {
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
+	if (!sme)
+		return QDF_STATUS_E_INVAL;
 
-	if (psSme) {
-		if (QDF_IS_STATUS_SUCCESS
-			    (qdf_mutex_acquire(&psSme->lkSmeGlobalLock)))
-			status = QDF_STATUS_SUCCESS;
-	}
-
-	return status;
+	return qdf_mutex_acquire(&sme->lkSmeGlobalLock);
 }
 
-QDF_STATUS sme_release_global_lock(tSmeStruct *psSme)
+QDF_STATUS sme_release_global_lock(struct sme_context *sme)
 {
-	QDF_STATUS status = QDF_STATUS_E_INVAL;
+	if (!sme)
+		return QDF_STATUS_E_INVAL;
 
-	if (psSme) {
-		if (QDF_IS_STATUS_SUCCESS
-			    (qdf_mutex_release(&psSme->lkSmeGlobalLock)))
-			status = QDF_STATUS_SUCCESS;
-	}
-
-	return status;
+	return qdf_mutex_release(&sme->lkSmeGlobalLock);
 }
 
 struct mac_context *sme_get_mac_context(void)