diff --git a/components/pmo/core/src/wlan_pmo_gtk.c b/components/pmo/core/src/wlan_pmo_gtk.c
index fc0585a8bea2..2084e1281c15 100644
--- a/components/pmo/core/src/wlan_pmo_gtk.c
+++ b/components/pmo/core/src/wlan_pmo_gtk.c
@@ -188,7 +188,6 @@ QDF_STATUS pmo_core_cache_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 	enum QDF_OPMODE opmode;
 	uint8_t vdev_id;
 
-	pmo_enter();
 	if (!gtk_req) {
 		pmo_err("gtk_req is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -219,7 +218,6 @@ QDF_STATUS pmo_core_cache_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -230,7 +228,6 @@ QDF_STATUS pmo_core_flush_gtk_offload_req(struct wlan_objmgr_vdev *vdev)
 	uint8_t vdev_id;
 	QDF_STATUS status;
 
-	pmo_enter();
 	if (!vdev) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -255,7 +252,6 @@ QDF_STATUS pmo_core_flush_gtk_offload_req(struct wlan_objmgr_vdev *vdev)
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	pmo_exit();
 
 	return status;
 }
diff --git a/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c b/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
index 29d1dd38c518..b3ddf9ba2c33 100644
--- a/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
+++ b/components/pmo/core/src/wlan_pmo_mc_addr_filtering.c
@@ -144,8 +144,6 @@ QDF_STATUS pmo_core_set_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 {
 	int i;
 
-	pmo_enter();
-
 	if (pmo_tgt_get_multiple_mc_filter_support(vdev)) {
 		pmo_debug("FW supports multiple mcast filter");
 		pmo_tgt_set_multiple_mc_filter_req(vdev, mc_list);
@@ -155,8 +153,6 @@ QDF_STATUS pmo_core_set_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 			pmo_tgt_set_mc_filter_req(vdev, mc_list->mc_addr[i]);
 	}
 
-	pmo_exit();
-
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -165,7 +161,6 @@ QDF_STATUS pmo_core_clear_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 {
 	int i;
 
-	pmo_enter();
 	if (pmo_tgt_get_multiple_mc_filter_support(vdev)) {
 		pmo_debug("FW supports multiple mcast filter");
 		pmo_tgt_clear_multiple_mc_filter_req(vdev, mc_list);
@@ -175,8 +170,6 @@ QDF_STATUS pmo_core_clear_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 			pmo_tgt_clear_mc_filter_req(vdev, mc_list->mc_addr[i]);
 	}
 
-	pmo_exit();
-
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -186,7 +179,6 @@ static QDF_STATUS pmo_core_do_enable_mc_addr_list(struct wlan_objmgr_vdev *vdev,
 {
 	QDF_STATUS status;
 
-	pmo_enter();
 	qdf_spin_lock_bh(&vdev_ctx->pmo_vdev_lock);
 	if (!vdev_ctx->vdev_mc_list_req.mc_cnt) {
 		qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
@@ -209,7 +201,6 @@ static QDF_STATUS pmo_core_do_enable_mc_addr_list(struct wlan_objmgr_vdev *vdev,
 	vdev_ctx->vdev_mc_list_req.is_filter_applied = true;
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -221,7 +212,6 @@ static QDF_STATUS pmo_core_do_disable_mc_addr_list(
 {
 	QDF_STATUS status;
 
-	pmo_enter();
 	qdf_spin_lock_bh(&vdev_ctx->pmo_vdev_lock);
 	/* validate filter is applied before clearing in fwr */
 	if (!vdev_ctx->vdev_mc_list_req.is_filter_applied) {
@@ -245,7 +235,6 @@ static QDF_STATUS pmo_core_do_disable_mc_addr_list(
 	vdev_ctx->vdev_mc_list_req.is_filter_applied = false;
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -350,8 +339,6 @@ QDF_STATUS pmo_core_cache_mc_addr_list(
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status;
 
-	pmo_enter();
-
 	if (!mc_list_config->psoc) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -384,7 +371,6 @@ QDF_STATUS pmo_core_cache_mc_addr_list(
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -439,8 +425,6 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger(
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct pmo_mc_addr_list *op_mc_list_req;
 
-	pmo_enter();
-
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	op_mc_list_req = qdf_mem_malloc(sizeof(*op_mc_list_req));
@@ -479,7 +463,6 @@ free_req:
 	qdf_mem_free(op_mc_list_req);
 
 exit_with_status:
-	pmo_exit();
 
 	return status;
 }
@@ -492,8 +475,6 @@ QDF_STATUS pmo_core_enable_mc_addr_filtering_in_fwr(
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	pmo_enter();
-
 	status = pmo_psoc_get_ref(psoc);
 	if (QDF_IS_STATUS_ERROR(status))
 		goto exit_with_status;
@@ -528,7 +509,6 @@ put_psoc:
 	pmo_psoc_put_ref(psoc);
 
 exit_with_status:
-	pmo_exit();
 
 	return status;
 }
@@ -591,8 +571,6 @@ QDF_STATUS pmo_core_disable_mc_addr_filtering_in_fwr(
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	pmo_enter();
-
 	if (!psoc) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -627,7 +605,6 @@ put_ref:
 	pmo_vdev_put_ref(vdev);
 
 out:
-	pmo_exit();
 
 	return status;
 }
diff --git a/components/pmo/core/src/wlan_pmo_ns.c b/components/pmo/core/src/wlan_pmo_ns.c
index 89b6086176dc..4783952f504d 100644
--- a/components/pmo/core/src/wlan_pmo_ns.c
+++ b/components/pmo/core/src/wlan_pmo_ns.c
@@ -78,8 +78,6 @@ static QDF_STATUS pmo_core_cache_ns_in_vdev_priv(
 	struct pmo_ns_offload_params request;
 	struct wlan_objmgr_peer *peer;
 
-	pmo_enter();
-
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	qdf_mem_zero(&request, sizeof(request));
@@ -114,7 +112,6 @@ static QDF_STATUS pmo_core_cache_ns_in_vdev_priv(
 		sizeof(vdev_ctx->vdev_ns_req));
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -147,8 +144,6 @@ static QDF_STATUS pmo_core_do_enable_ns_offload(struct wlan_objmgr_vdev *vdev,
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	pmo_enter();
-
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	psoc_ctx = vdev_ctx->pmo_psoc_ctx;
@@ -179,7 +174,6 @@ static QDF_STATUS pmo_core_do_enable_ns_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	}
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -259,8 +253,6 @@ QDF_STATUS pmo_core_ns_check_offload(struct wlan_objmgr_psoc *psoc,
 	bool active_offload_cond, is_applied_cond;
 	enum QDF_OPMODE opmode;
 
-	pmo_enter();
-
 	vdev = pmo_psoc_get_vdev(psoc, vdev_id);
 	if (!vdev) {
 		pmo_err("vdev is NULL");
@@ -306,7 +298,6 @@ QDF_STATUS pmo_core_cache_ns_offload_req(struct pmo_ns_req *ns_req)
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	pmo_enter();
 	if (!ns_req) {
 		pmo_err("ns is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -344,7 +335,6 @@ QDF_STATUS pmo_core_cache_ns_offload_req(struct pmo_ns_req *ns_req)
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -388,7 +378,6 @@ QDF_STATUS pmo_core_enable_ns_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	uint8_t vdev_id;
 
-	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -436,7 +425,6 @@ skip_ns_dynamic_check:
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	pmo_exit();
 
 	return status;
 }
diff --git a/components/pmo/core/src/wlan_pmo_wow.c b/components/pmo/core/src/wlan_pmo_wow.c
index 2c32c9a41ebd..fc31f14a1dc3 100644
--- a/components/pmo/core/src/wlan_pmo_wow.c
+++ b/components/pmo/core/src/wlan_pmo_wow.c
@@ -214,30 +214,26 @@ void pmo_core_disable_wakeup_event(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	uint32_t bitmap[PMO_WOW_MAX_EVENT_BM_LEN] = {0};
 
-	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is null");
-		goto out;
+		return;
 	}
 
 	vdev = pmo_psoc_get_vdev(psoc, vdev_id);
 	if (!vdev) {
 		pmo_err("vdev is NULL");
-		goto out;
+		return;
 	}
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
-		goto out;
+		return;
 
 	pmo_set_wow_event_bitmap(wow_event, PMO_WOW_MAX_EVENT_BM_LEN, bitmap);
 
 	pmo_tgt_disable_wow_wakeup_event(vdev, bitmap);
 
 	pmo_vdev_put_ref(vdev);
-
-out:
-	pmo_exit();
 }
 
 /**
diff --git a/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c b/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
index 292b746f7704..b6a458cf80c4 100644
--- a/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
+++ b/components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c
@@ -274,8 +274,6 @@ QDF_STATUS pmo_vdev_ready(struct wlan_objmgr_vdev *vdev)
 {
 	QDF_STATUS status;
 
-	pmo_enter();
-
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
 		return status;
@@ -288,8 +286,6 @@ QDF_STATUS pmo_vdev_ready(struct wlan_objmgr_vdev *vdev)
 
 	pmo_vdev_put_ref(vdev);
 
-	pmo_exit();
-
 	/*
 	 * The above APIs should return a status but don't.
 	 * Just return success for now.
diff --git a/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
index 4f0419a81674..13dcca43c678 100644
--- a/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
+++ b/components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c
@@ -61,13 +61,9 @@ QDF_STATUS pmo_tgt_enable_arp_offload_req(struct wlan_objmgr_vdev *vdev,
 		sizeof(*ns_offload_req));
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 
-	pmo_debug("ARP Offload vdev_id: %d enable: %d",
-		vdev_id,
-		arp_offload_req->enable);
-	pmo_debug("NS Offload vdev_id: %d enable: %d ns_count: %u",
-		vdev_id,
-		ns_offload_req->enable,
-		ns_offload_req->num_ns_offload_count);
+	pmo_debug("vdev_id: %d: ARP offload %d NS offload %d ns_count %u",
+		  vdev_id, arp_offload_req->enable, ns_offload_req->enable,
+		  ns_offload_req->num_ns_offload_count);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_arp_offload_req) {
diff --git a/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
index 8fd98098202d..e8118f81ca70 100644
--- a/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
+++ b/components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -86,8 +86,6 @@ bool pmo_tgt_get_multiple_mc_filter_support(struct wlan_objmgr_vdev *vdev)
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 	struct wlan_objmgr_psoc *psoc;
 
-	pmo_enter();
-
 	psoc = pmo_vdev_get_psoc(vdev);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
@@ -106,8 +104,6 @@ QDF_STATUS pmo_tgt_set_multiple_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	pmo_enter();
-
 	psoc = pmo_vdev_get_psoc(vdev);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
@@ -122,7 +118,6 @@ QDF_STATUS pmo_tgt_set_multiple_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to add/clear multiple mc filter");
 out:
-	pmo_exit();
 
 	return status;
 }
@@ -134,8 +129,6 @@ QDF_STATUS pmo_tgt_clear_multiple_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	pmo_enter();
-
 	psoc = pmo_vdev_get_psoc(vdev);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
@@ -150,7 +143,6 @@ QDF_STATUS pmo_tgt_clear_multiple_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to add/clear multiple mc filter");
 out:
-	pmo_exit();
 
 	return status;
 }
diff --git a/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
index 6d7b9cad5707..df08c5dca11d 100644
--- a/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
+++ b/components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018, 2020 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -37,7 +37,6 @@ QDF_STATUS pmo_tgt_enable_ns_offload_req(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	pmo_enter();
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	psoc = pmo_vdev_get_psoc(vdev);
@@ -63,13 +62,10 @@ QDF_STATUS pmo_tgt_enable_ns_offload_req(struct wlan_objmgr_vdev *vdev,
 		sizeof(*ns_offload_req));
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 
-	pmo_debug("ARP Offload vdev_id: %d enable: %d",
-		vdev_id,
-		arp_offload_req->enable);
-	pmo_debug("NS Offload vdev_id: %d enable: %d ns_count: %u",
-		vdev_id,
-		ns_offload_req->enable,
-		ns_offload_req->num_ns_offload_count);
+	pmo_debug("vdev_id: %d: ARP offload %d NS offload  %d ns_count %u",
+		  vdev_id,
+		  arp_offload_req->enable, ns_offload_req->enable,
+		  ns_offload_req->num_ns_offload_count);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_ns_offload_req) {
@@ -96,7 +92,6 @@ out:
 		qdf_mem_free(arp_offload_req);
 	if (ns_offload_req)
 		qdf_mem_free(ns_offload_req);
-	pmo_exit();
 
 	return status;
 }
diff --git a/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c b/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
index 312cfd883730..a0c5874b2e55 100644
--- a/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
+++ b/components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c
@@ -64,8 +64,6 @@ QDF_STATUS pmo_tgt_disable_wow_wakeup_event(
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 	int vdev_id;
 
-	pmo_enter();
-
 	psoc = pmo_vdev_get_psoc(vdev);
 	vdev_id = pmo_vdev_get_id(vdev);
 
@@ -83,7 +81,6 @@ QDF_STATUS pmo_tgt_disable_wow_wakeup_event(
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to disable wow wakeup event");
 out:
-	pmo_exit();
 
 	return status;
 }