qcacld-3.0: Rename PMO_ENTER and PMO_EXIT macros

In order to better align with the other PMO logging wrappers, and the
rest of the driver, rename the following macros:
 * PMO_ENTER -> pmo_enter
 * PMO_EXIT -> pmo_exit

Change-Id: I9186c1425f22c5a8d4fc98f048a9d487b6095797
CRs-Fixed: 2206650

components/pmo/core/inc/wlan_pmo_main.h

@@ -42,8 +42,8 @@
 #define pmo_debug(format, args...) \
 		pmo_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
 
-#define PMO_ENTER() pmo_debug("enter")
-#define PMO_EXIT() pmo_debug("exit")
+#define pmo_enter() pmo_debug("enter")
+#define pmo_exit() pmo_debug("exit")
 
 #define PMO_VDEV_IN_STA_MODE(mode) \
 	((mode) == QDF_STA_MODE || (mode) == QDF_P2P_CLIENT_MODE ? 1 : 0)

components/pmo/core/src/wlan_pmo_arp.c

@@ -34,7 +34,7 @@ static QDF_STATUS pmo_core_cache_arp_in_vdev_priv(
 	int index;
 	struct qdf_mac_addr peer_bssid;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -77,7 +77,7 @@ free_req:
 	qdf_mem_free(request);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -87,7 +87,7 @@ static QDF_STATUS pmo_core_flush_arp_from_vdev_priv(
 {
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -97,7 +97,7 @@ static QDF_STATUS pmo_core_flush_arp_from_vdev_priv(
 	vdev_ctx->vdev_arp_req.enable = PMO_OFFLOAD_DISABLE;
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -109,7 +109,7 @@ static QDF_STATUS pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -147,7 +147,7 @@ static QDF_STATUS pmo_core_do_enable_arp_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -159,7 +159,7 @@ static QDF_STATUS pmo_core_do_disable_arp_offload(struct wlan_objmgr_vdev *vdev,
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -187,7 +187,7 @@ static QDF_STATUS pmo_core_do_disable_arp_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -225,7 +225,7 @@ QDF_STATUS pmo_core_cache_arp_offload_req(struct pmo_arp_req *arp_req)
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!arp_req) {
 		pmo_err("arp_req is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -260,7 +260,7 @@ QDF_STATUS pmo_core_cache_arp_offload_req(struct pmo_arp_req *arp_req)
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -270,7 +270,7 @@ QDF_STATUS pmo_core_flush_arp_offload_req(struct wlan_objmgr_vdev *vdev)
 	QDF_STATUS status;
 	uint8_t vdev_id;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -292,7 +292,7 @@ QDF_STATUS pmo_core_flush_arp_offload_req(struct wlan_objmgr_vdev *vdev)
 def_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -303,7 +303,7 @@ QDF_STATUS pmo_core_enable_arp_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	uint8_t vdev_id;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -326,7 +326,7 @@ QDF_STATUS pmo_core_enable_arp_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 def_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -337,7 +337,7 @@ QDF_STATUS pmo_core_disable_arp_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	uint8_t vdev_id;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -360,7 +360,7 @@ QDF_STATUS pmo_core_disable_arp_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 def_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_gtk.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements gtk offload feature API's
  */
@@ -173,7 +174,7 @@ QDF_STATUS pmo_core_cache_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 	enum QDF_OPMODE opmode;
 	uint8_t vdev_id;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!gtk_req) {
 		pmo_err("gtk_req is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -204,7 +205,7 @@ QDF_STATUS pmo_core_cache_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -215,7 +216,7 @@ QDF_STATUS pmo_core_flush_gtk_offload_req(struct wlan_objmgr_vdev *vdev)
 	uint8_t vdev_id;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -240,7 +241,7 @@ QDF_STATUS pmo_core_flush_gtk_offload_req(struct wlan_objmgr_vdev *vdev)
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -251,7 +252,7 @@ QDF_STATUS pmo_core_enable_gtk_offload_in_fwr(struct wlan_objmgr_vdev *vdev)
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	struct pmo_gtk_req *op_gtk_req = NULL;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -276,7 +277,7 @@ dec_ref:
 out:
 	if (op_gtk_req)
 		qdf_mem_free(op_gtk_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -287,7 +288,7 @@ QDF_STATUS pmo_core_disable_gtk_offload_in_fwr(struct wlan_objmgr_vdev *vdev)
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	struct pmo_gtk_req *op_gtk_req = NULL;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -313,7 +314,7 @@ dec_ref:
 out:
 	if (op_gtk_req)
 		qdf_mem_free(op_gtk_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -324,7 +325,7 @@ QDF_STATUS pmo_core_get_gtk_rsp(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!gtk_rsp_req || !vdev) {
 		pmo_err("%s is null", !vdev ? "vdev":"gtk_rsp_req");
 		status = QDF_STATUS_E_INVAL;
@@ -351,7 +352,7 @@ QDF_STATUS pmo_core_get_gtk_rsp(struct wlan_objmgr_vdev *vdev,
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_hw_filter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -32,7 +32,7 @@ static QDF_STATUS pmo_core_conf_hw_filter(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	struct pmo_hw_filter_params req = { .mode = mode, };
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!pmo_core_is_vdev_connected(vdev)) {
 		status = QDF_STATUS_E_NOSUPPORT;
@@ -43,7 +43,7 @@ static QDF_STATUS pmo_core_conf_hw_filter(struct wlan_objmgr_vdev *vdev,
 	status = pmo_tgt_conf_hw_filter(pmo_vdev_get_psoc(vdev), &req);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -54,7 +54,7 @@ QDF_STATUS pmo_core_enable_hw_filter_in_fwr(struct wlan_objmgr_vdev *vdev)
 	struct pmo_psoc_priv_obj *psoc_priv;
 	enum pmo_hw_filter_mode mode;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -70,7 +70,7 @@ QDF_STATUS pmo_core_enable_hw_filter_in_fwr(struct wlan_objmgr_vdev *vdev)
 	pmo_vdev_put_ref(vdev);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -79,7 +79,7 @@ QDF_STATUS pmo_core_disable_hw_filter_in_fwr(struct wlan_objmgr_vdev *vdev)
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -90,7 +90,7 @@ QDF_STATUS pmo_core_disable_hw_filter_in_fwr(struct wlan_objmgr_vdev *vdev)
 	pmo_vdev_put_ref(vdev);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_main.c

@@ -165,7 +165,7 @@ QDF_STATUS pmo_core_get_psoc_config(struct wlan_objmgr_psoc *psoc,
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc || !psoc_cfg) {
 		pmo_err("%s is null", !psoc ? "psoc":"psoc_cfg");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -177,7 +177,7 @@ QDF_STATUS pmo_core_get_psoc_config(struct wlan_objmgr_psoc *psoc,
 	}
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -188,7 +188,7 @@ QDF_STATUS pmo_core_update_psoc_config(struct wlan_objmgr_psoc *psoc,
 	struct pmo_psoc_priv_obj *psoc_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc || !psoc_cfg) {
 		pmo_err("%s is null", !psoc ? "psoc":"psoc_cfg");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -200,7 +200,7 @@ QDF_STATUS pmo_core_update_psoc_config(struct wlan_objmgr_psoc *psoc,
 	}
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_mc_addr_filtering.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements mc addr filtering offload feature API's
  */
@@ -24,7 +25,6 @@
 #include "wlan_pmo_main.h"
 #include "wlan_pmo_obj_mgmt_public_struct.h"
 
-
 #define PMO_INVALID_MC_ADDR_COUNT (-1)
 
 static void pmo_core_fill_mc_list(struct pmo_vdev_priv_obj **vdev_ctx,
@@ -106,7 +106,7 @@ QDF_STATUS pmo_core_enhanced_mc_filter_enable(struct wlan_objmgr_vdev *vdev)
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -117,7 +117,7 @@ QDF_STATUS pmo_core_enhanced_mc_filter_enable(struct wlan_objmgr_vdev *vdev)
 	pmo_vdev_put_ref(vdev);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -126,7 +126,7 @@ QDF_STATUS pmo_core_enhanced_mc_filter_disable(struct wlan_objmgr_vdev *vdev)
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -137,7 +137,7 @@ QDF_STATUS pmo_core_enhanced_mc_filter_disable(struct wlan_objmgr_vdev *vdev)
 	pmo_vdev_put_ref(vdev);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -147,7 +147,7 @@ QDF_STATUS pmo_core_set_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 {
 	int i;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (pmo_tgt_get_multiple_mc_filter_support(vdev)) {
 		pmo_debug("FW supports multiple mcast filter");
@@ -158,7 +158,7 @@ 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();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -168,7 +168,7 @@ QDF_STATUS pmo_core_clear_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 {
 	int i;
 
-	PMO_ENTER();
+	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);
@@ -178,7 +178,7 @@ 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();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -189,7 +189,7 @@ static QDF_STATUS pmo_core_do_enable_mc_addr_list(struct wlan_objmgr_vdev *vdev,
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	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);
@@ -212,7 +212,7 @@ 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();
+	pmo_exit();
 
 	return status;
 }
@@ -224,7 +224,7 @@ static QDF_STATUS pmo_core_do_disable_mc_addr_list(
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	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) {
@@ -248,7 +248,7 @@ 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();
+	pmo_exit();
 
 	return status;
 }
@@ -350,7 +350,7 @@ QDF_STATUS pmo_core_cache_mc_addr_list(
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!mc_list_config->psoc) {
 		pmo_err("psoc is NULL");
@@ -383,7 +383,7 @@ QDF_STATUS pmo_core_cache_mc_addr_list(
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -394,7 +394,7 @@ QDF_STATUS pmo_core_flush_mc_addr_list(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -427,7 +427,7 @@ QDF_STATUS pmo_core_flush_mc_addr_list(struct wlan_objmgr_psoc *psoc,
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -440,7 +440,7 @@ static QDF_STATUS pmo_core_handle_enable_mc_list_trigger(
 	QDF_STATUS status;
 	struct pmo_mc_addr_list *op_mc_list_req;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -482,7 +482,7 @@ free_req:
 	qdf_mem_free(op_mc_list_req);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -495,7 +495,7 @@ QDF_STATUS pmo_core_enable_mc_addr_filtering_in_fwr(
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_psoc_get_ref(psoc);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -526,7 +526,7 @@ put_psoc:
 	pmo_psoc_put_ref(psoc);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -590,7 +590,7 @@ QDF_STATUS pmo_core_disable_mc_addr_filtering_in_fwr(
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -617,7 +617,7 @@ QDF_STATUS pmo_core_disable_mc_addr_filtering_in_fwr(
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_ns.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements ns offload feature API's
  */
@@ -25,7 +26,7 @@
 #include "wlan_pmo_obj_mgmt_public_struct.h"
 
 static void pmo_core_fill_ns_addr(struct pmo_ns_offload_params *request,
-	struct pmo_ns_req *ns_req)
+				  struct pmo_ns_req *ns_req)
 {
 	int i;
 
@@ -75,7 +76,7 @@ static QDF_STATUS pmo_core_cache_ns_in_vdev_priv(
 	struct pmo_ns_offload_params request;
 	struct wlan_objmgr_peer *peer;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -109,7 +110,7 @@ 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();
+	pmo_exit();
 
 	return status;
 }
@@ -119,7 +120,7 @@ static QDF_STATUS pmo_core_flush_ns_from_vdev_priv(
 {
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -129,7 +130,7 @@ static QDF_STATUS pmo_core_flush_ns_from_vdev_priv(
 	vdev_ctx->vdev_ns_req.enable = PMO_OFFLOAD_DISABLE;
 	qdf_spin_unlock_bh(&vdev_ctx->pmo_vdev_lock);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -141,7 +142,7 @@ 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();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -180,7 +181,7 @@ static QDF_STATUS pmo_core_do_enable_ns_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -191,7 +192,7 @@ static QDF_STATUS pmo_core_do_disable_ns_offload(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc_ctx = pmo_vdev_get_psoc_priv(vdev);
 
@@ -223,7 +224,7 @@ static QDF_STATUS pmo_core_do_disable_ns_offload(struct wlan_objmgr_vdev *vdev,
 		break;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -263,7 +264,7 @@ QDF_STATUS pmo_core_cache_ns_offload_req(
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!ns_req) {
 		pmo_err("ns is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -301,7 +302,7 @@ QDF_STATUS pmo_core_cache_ns_offload_req(
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -311,7 +312,7 @@ QDF_STATUS pmo_core_flush_ns_offload_req(struct wlan_objmgr_vdev *vdev)
 	QDF_STATUS status;
 	uint8_t vdev_id;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -333,7 +334,7 @@ QDF_STATUS pmo_core_flush_ns_offload_req(struct wlan_objmgr_vdev *vdev)
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -345,7 +346,7 @@ 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();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -394,7 +395,7 @@ skip_ns_dynamic_check:
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -406,7 +407,7 @@ QDF_STATUS pmo_core_disable_ns_offload_in_fwr(struct wlan_objmgr_vdev *vdev,
 	uint8_t vdev_id;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!vdev) {
 		pmo_err("vdev is NULL");
 		status = QDF_STATUS_E_INVAL;
@@ -447,7 +448,7 @@ skip_ns_dynamic_check:
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/core/src/wlan_pmo_pkt_filter.c

@@ -46,7 +46,7 @@ QDF_STATUS pmo_core_set_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!psoc) {
 		pmo_err("psoc is null");
@@ -68,7 +68,7 @@ QDF_STATUS pmo_core_set_pkt_filter(struct wlan_objmgr_psoc *psoc,
 dec_ref:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_PMO_ID);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 
@@ -81,7 +81,7 @@ QDF_STATUS pmo_core_clear_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!psoc) {
 		pmo_err("psoc is null");
@@ -104,7 +104,7 @@ QDF_STATUS pmo_core_clear_pkt_filter(struct wlan_objmgr_psoc *psoc,
 dec_ref:
 	wlan_objmgr_vdev_release_ref(vdev, WLAN_PMO_ID);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 

components/pmo/core/src/wlan_pmo_suspend_resume.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Define API's for suspend / resume handling
  */
@@ -293,7 +294,7 @@ static QDF_STATUS pmo_core_psoc_configure_suspend(struct wlan_objmgr_psoc *psoc)
 {
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
@@ -315,7 +316,7 @@ static QDF_STATUS pmo_core_psoc_configure_suspend(struct wlan_objmgr_psoc *psoc)
 	 */
 	pmo_core_update_wow_bus_suspend(psoc, psoc_ctx, true);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -325,7 +326,7 @@ QDF_STATUS pmo_core_psoc_user_space_suspend_req(struct wlan_objmgr_psoc *psoc,
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_psoc_get_ref(psoc);
 	if (status != QDF_STATUS_SUCCESS) {
@@ -347,7 +348,7 @@ QDF_STATUS pmo_core_psoc_user_space_suspend_req(struct wlan_objmgr_psoc *psoc,
 dec_psoc_ref:
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -503,7 +504,7 @@ static QDF_STATUS pmo_core_psoc_configure_resume(struct wlan_objmgr_psoc *psoc)
 {
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
@@ -511,7 +512,7 @@ static QDF_STATUS pmo_core_psoc_configure_resume(struct wlan_objmgr_psoc *psoc)
 	pmo_core_update_wow_bus_suspend(psoc, psoc_ctx, false);
 	pmo_unpause_all_vdev(psoc, psoc_ctx);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -521,7 +522,7 @@ QDF_STATUS pmo_core_psoc_user_space_resume_req(struct wlan_objmgr_psoc *psoc,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_psoc_get_ref(psoc);
 	if (status != QDF_STATUS_SUCCESS) {
@@ -543,7 +544,7 @@ QDF_STATUS pmo_core_psoc_user_space_resume_req(struct wlan_objmgr_psoc *psoc,
 dec_psoc_ref:
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -565,7 +566,7 @@ QDF_STATUS pmo_core_enable_wow_in_fw(struct wlan_objmgr_psoc *psoc,
 	struct pmo_wow_cmd_params param = {0};
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 	qdf_event_reset(&psoc_ctx->wow.target_suspend);
 	pmo_core_set_wow_nack(psoc_ctx, false);
 	host_credits = pmo_tgt_psoc_get_host_credits(psoc);
@@ -654,7 +655,7 @@ QDF_STATUS pmo_core_enable_wow_in_fw(struct wlan_objmgr_psoc *psoc,
 
 	pmo_core_update_wow_enable_cmd_sent(psoc_ctx, true);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -666,7 +667,7 @@ QDF_STATUS pmo_core_psoc_suspend_target(struct wlan_objmgr_psoc *psoc,
 	struct pmo_suspend_params param;
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
@@ -687,7 +688,7 @@ QDF_STATUS pmo_core_psoc_suspend_target(struct wlan_objmgr_psoc *psoc,
 		/* wma_suspend_target_timeout(pmac->sme.enableSelfRecovery); */
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -700,7 +701,7 @@ QDF_STATUS pmo_core_psoc_bus_suspend_req(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	bool wow_mode_selected = false;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is NULL");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -731,7 +732,7 @@ QDF_STATUS pmo_core_psoc_bus_suspend_req(struct wlan_objmgr_psoc *psoc,
 
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -747,7 +748,7 @@ QDF_STATUS pmo_core_psoc_bus_runtime_suspend(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct pmo_wow_enable_params wow_params = {0};
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!psoc) {
 		pmo_err("psoc is NULL");
@@ -836,7 +837,7 @@ dec_psoc_ref:
 	pmo_psoc_put_ref(psoc);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -850,7 +851,7 @@ QDF_STATUS pmo_core_psoc_bus_runtime_resume(struct wlan_objmgr_psoc *psoc,
 	void *htc_ctx;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!psoc) {
 		pmo_err("psoc is NULL");
@@ -902,7 +903,7 @@ dec_psoc_ref:
 	pmo_psoc_put_ref(psoc);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -925,7 +926,7 @@ QDF_STATUS pmo_core_psoc_send_host_wakeup_ind_to_fw(
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	qdf_event_reset(&psoc_ctx->wow.target_resume);
 
 	status = pmo_tgt_psoc_send_host_wakeup_ind(psoc);
@@ -950,7 +951,7 @@ QDF_STATUS pmo_core_psoc_send_host_wakeup_ind_to_fw(
 	if (status == QDF_STATUS_SUCCESS)
 		pmo_tgt_update_target_suspend_flag(psoc, false);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -968,7 +969,7 @@ QDF_STATUS pmo_core_psoc_disable_wow_in_fw(struct wlan_objmgr_psoc *psoc,
 {
 	QDF_STATUS ret;
 
-	PMO_ENTER();
+	pmo_enter();
 	ret = pmo_core_psoc_send_host_wakeup_ind_to_fw(psoc, psoc_ctx);
 	if (ret != QDF_STATUS_SUCCESS)
 		goto out;
@@ -981,7 +982,7 @@ QDF_STATUS pmo_core_psoc_disable_wow_in_fw(struct wlan_objmgr_psoc *psoc,
 	/* Unpause the vdev as we are resuming */
 	pmo_unpause_all_vdev(psoc, psoc_ctx);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return ret;
 }
@@ -999,7 +1000,7 @@ QDF_STATUS pmo_core_psoc_resume_target(struct wlan_objmgr_psoc *psoc,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	qdf_event_reset(&psoc_ctx->wow.target_resume);
 
 	status = pmo_tgt_psoc_send_target_resume_req(psoc);
@@ -1023,7 +1024,7 @@ QDF_STATUS pmo_core_psoc_resume_target(struct wlan_objmgr_psoc *psoc,
 	if (status == QDF_STATUS_SUCCESS)
 		pmo_tgt_update_target_suspend_flag(psoc, false);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -1035,7 +1036,7 @@ QDF_STATUS pmo_core_psoc_bus_resume_req(struct wlan_objmgr_psoc *psoc,
 	bool wow_mode;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is null");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -1062,7 +1063,7 @@ QDF_STATUS pmo_core_psoc_bus_resume_req(struct wlan_objmgr_psoc *psoc,
 	pmo_psoc_put_ref(psoc);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -1073,7 +1074,7 @@ void pmo_core_psoc_target_suspend_acknowledge(void *context, bool wow_nack)
 	struct wlan_objmgr_psoc *psoc = (struct wlan_objmgr_psoc *)context;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is null");
 		goto out;
@@ -1096,14 +1097,14 @@ void pmo_core_psoc_target_suspend_acknowledge(void *context, bool wow_nack)
 
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 }
 
 void pmo_core_psoc_wakeup_host_event_received(struct wlan_objmgr_psoc *psoc)
 {
 	struct pmo_psoc_priv_obj *psoc_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is null");
 		goto out;
@@ -1113,7 +1114,7 @@ void pmo_core_psoc_wakeup_host_event_received(struct wlan_objmgr_psoc *psoc)
 	psoc_ctx->wow.wow_state = pmo_wow_state_none;
 	qdf_event_set(&psoc_ctx->wow.target_resume);
 out:
-	PMO_EXIT();
+	pmo_exit();
 }
 
 int pmo_core_psoc_is_target_wake_up_received(struct wlan_objmgr_psoc *psoc)
@@ -1143,7 +1144,7 @@ int pmo_core_psoc_is_target_wake_up_received(struct wlan_objmgr_psoc *psoc)
 
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return ret;
 }
@@ -1173,7 +1174,7 @@ int pmo_core_psoc_clear_target_wake_up(struct wlan_objmgr_psoc *psoc)
 
 	pmo_psoc_put_ref(psoc);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return ret;
 }
@@ -1184,7 +1185,7 @@ void pmo_core_psoc_handle_initial_wake_up(void *cb_ctx)
 	struct wlan_objmgr_psoc *psoc = (struct wlan_objmgr_psoc *)cb_ctx;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("cb ctx/psoc is null");
 		goto out;
@@ -1202,6 +1203,6 @@ void pmo_core_psoc_handle_initial_wake_up(void *cb_ctx)
 	pmo_psoc_put_ref(psoc);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 }
 

components/pmo/core/src/wlan_pmo_wow.c

@@ -88,7 +88,7 @@ QDF_STATUS pmo_core_add_wow_user_pattern(struct wlan_objmgr_vdev *vdev,
 
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -122,7 +122,7 @@ QDF_STATUS pmo_core_del_wow_user_pattern(struct wlan_objmgr_vdev *vdev,
 rel_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -133,7 +133,7 @@ void pmo_core_enable_wakeup_event(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	if (!psoc) {
 		pmo_err("psoc is null");
@@ -157,7 +157,7 @@ void pmo_core_enable_wakeup_event(struct wlan_objmgr_psoc *psoc,
 	pmo_vdev_put_ref(vdev);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 }
 
 void pmo_core_disable_wakeup_event(struct wlan_objmgr_psoc *psoc,
@@ -166,7 +166,7 @@ void pmo_core_disable_wakeup_event(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_objmgr_vdev *vdev;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!psoc) {
 		pmo_err("psoc is null");
 		goto out;
@@ -189,7 +189,7 @@ void pmo_core_disable_wakeup_event(struct wlan_objmgr_psoc *psoc,
 	pmo_vdev_put_ref(vdev);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 }
 
 /**

components/pmo/dispatcher/src/wlan_pmo_obj_mgmt_api.c

@@ -31,7 +31,7 @@ QDF_STATUS pmo_init(void)
 	QDF_STATUS status;
 	struct wlan_pmo_ctx *pmo_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (pmo_allocate_ctx() != QDF_STATUS_SUCCESS) {
 		pmo_err("unable to allocate psoc ctx");
 		status = QDF_STATUS_E_FAULT;
@@ -79,7 +79,7 @@ QDF_STATUS pmo_init(void)
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("unable to register vdev create handle");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -89,7 +89,7 @@ QDF_STATUS pmo_deinit(void)
 	QDF_STATUS status;
 	struct wlan_pmo_ctx *pmo_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		pmo_err("unable to get pmo ctx");
@@ -135,7 +135,7 @@ QDF_STATUS pmo_deinit(void)
 
 out:
 	pmo_free_ctx();
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -147,7 +147,7 @@ QDF_STATUS pmo_psoc_object_created_notification(
 	QDF_STATUS status;
 	struct wlan_pmo_ctx *pmo_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		QDF_ASSERT(0);
@@ -190,7 +190,7 @@ QDF_STATUS pmo_psoc_object_created_notification(
 	/* Register PMO tx ops*/
 	target_if_pmo_register_tx_ops(&psoc_ctx->pmo_tx_ops);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -201,7 +201,7 @@ QDF_STATUS pmo_psoc_object_destroyed_notification(
 	struct pmo_psoc_priv_obj *psoc_ctx = NULL;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc_ctx = pmo_psoc_get_priv(psoc);
 
@@ -221,7 +221,7 @@ QDF_STATUS pmo_psoc_object_destroyed_notification(
 	qdf_mem_zero(psoc_ctx, sizeof(*psoc_ctx));
 	qdf_mem_free(psoc_ctx);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -234,7 +234,7 @@ QDF_STATUS pmo_vdev_object_created_notification(
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -263,7 +263,7 @@ QDF_STATUS pmo_vdev_object_created_notification(
 	qdf_atomic_init(&vdev_ctx->gtk_err_enable);
 
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -272,7 +272,7 @@ QDF_STATUS pmo_vdev_ready(struct wlan_objmgr_vdev *vdev)
 {
 	QDF_STATUS status;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	status = pmo_vdev_get_ref(vdev);
 	if (QDF_IS_STATUS_ERROR(status))
@@ -287,7 +287,7 @@ QDF_STATUS pmo_vdev_ready(struct wlan_objmgr_vdev *vdev)
 
 	pmo_vdev_put_ref(vdev);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	/*
 	 * The above APIs should return a status but don't.
@@ -302,7 +302,7 @@ QDF_STATUS pmo_vdev_object_destroyed_notification(
 	struct pmo_vdev_priv_obj *vdev_ctx = NULL;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -315,7 +315,7 @@ QDF_STATUS pmo_vdev_object_destroyed_notification(
 	qdf_spinlock_destroy(&vdev_ctx->pmo_vdev_lock);
 	qdf_mem_free(vdev_ctx);
 
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -328,7 +328,7 @@ QDF_STATUS pmo_register_suspend_handler(
 	struct wlan_pmo_ctx *pmo_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		QDF_ASSERT(0);
@@ -349,7 +349,7 @@ QDF_STATUS pmo_register_suspend_handler(
 	pmo_ctx->pmo_suspend_handler_arg[id] = arg;
 	qdf_spin_unlock_bh(&pmo_ctx->lock);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -361,7 +361,7 @@ QDF_STATUS pmo_unregister_suspend_handler(
 	struct wlan_pmo_ctx *pmo_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		QDF_ASSERT(0);
@@ -388,7 +388,7 @@ QDF_STATUS pmo_unregister_suspend_handler(
 		status = QDF_STATUS_E_FAILURE;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -401,7 +401,7 @@ QDF_STATUS pmo_register_resume_handler(
 	struct wlan_pmo_ctx *pmo_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		pmo_err("unable to get pmo ctx");
@@ -421,7 +421,7 @@ QDF_STATUS pmo_register_resume_handler(
 	pmo_ctx->pmo_resume_handler_arg[id] = arg;
 	qdf_spin_unlock_bh(&pmo_ctx->lock);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -433,7 +433,7 @@ QDF_STATUS pmo_unregister_resume_handler(
 	struct wlan_pmo_ctx *pmo_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
 		pmo_err("unable to get pmo ctx");
@@ -459,7 +459,7 @@ QDF_STATUS pmo_unregister_resume_handler(
 		status = QDF_STATUS_E_FAILURE;
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -474,7 +474,7 @@ QDF_STATUS pmo_suspend_all_components(struct wlan_objmgr_psoc *psoc,
 	pmo_psoc_suspend_handler handler;
 	void *arg;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
@@ -526,7 +526,7 @@ suspend_recovery:
 	}
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -540,7 +540,7 @@ QDF_STATUS pmo_resume_all_components(struct wlan_objmgr_psoc *psoc,
 	pmo_psoc_suspend_handler handler;
 	void *arg;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	pmo_ctx = pmo_get_context();
 	if (!pmo_ctx) {
@@ -570,7 +570,7 @@ QDF_STATUS pmo_resume_all_components(struct wlan_objmgr_psoc *psoc,
 	}
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_arp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -35,7 +36,7 @@ QDF_STATUS pmo_tgt_enable_arp_offload_req(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -85,7 +86,7 @@ out:
 		qdf_mem_free(arp_offload_req);
 	if (ns_offload_req)
 		qdf_mem_free(ns_offload_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -100,7 +101,7 @@ QDF_STATUS pmo_tgt_disable_arp_offload_req(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -151,7 +152,7 @@ out:
 		qdf_mem_free(arp_offload_req);
 	if (ns_offload_req)
 		qdf_mem_free(ns_offload_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_gtk.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for PMO GTK offload feature to interact
  * with target/wmi.
@@ -34,7 +35,7 @@ QDF_STATUS pmo_tgt_send_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 	struct pmo_vdev_priv_obj *vdev_ctx;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		pmo_err("Failed to find psoc from from vdev:%pK",
@@ -79,7 +80,7 @@ QDF_STATUS pmo_tgt_send_gtk_offload_req(struct wlan_objmgr_vdev *vdev,
 out:
 	if (op_gtk_req)
 		qdf_mem_free(op_gtk_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -91,7 +92,7 @@ QDF_STATUS pmo_tgt_get_gtk_rsp(struct wlan_objmgr_vdev *vdev)
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
 		pmo_err("Failed to find psoc from from vdev:%pK",
@@ -110,7 +111,7 @@ QDF_STATUS pmo_tgt_get_gtk_rsp(struct wlan_objmgr_vdev *vdev)
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send_get_gtk_rsp_cmd  event");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -122,7 +123,7 @@ QDF_STATUS pmo_tgt_gtk_rsp_evt(struct wlan_objmgr_psoc *psoc,
 	struct wlan_objmgr_vdev *vdev;
 	struct pmo_vdev_priv_obj *vdev_ctx;
 
-	PMO_ENTER();
+	pmo_enter();
 	if (!rsp_param) {
 		pmo_err("gtk rsp param is null");
 		status = QDF_STATUS_E_NULL_VALUE;
@@ -171,7 +172,7 @@ QDF_STATUS pmo_tgt_gtk_rsp_evt(struct wlan_objmgr_psoc *psoc,
 dec_ref:
 	pmo_vdev_put_ref(vdev);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_hw_filter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -31,7 +31,7 @@ QDF_STATUS pmo_tgt_conf_hw_filter(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	pmo_debug("Configure hw filter; vdev_id:%u, mode:%d",
 		  req->vdev_id, req->mode);
@@ -46,7 +46,7 @@ QDF_STATUS pmo_tgt_conf_hw_filter(struct wlan_objmgr_psoc *psoc,
 	status = ops.send_conf_hw_filter_req(psoc, req);
 
 exit_with_status:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_lphb.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo low power hear beat feature
  * to interact with target/WMI.
@@ -31,7 +32,7 @@ QDF_STATUS pmo_tgt_send_lphb_enable(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_lphb_enable) {
 		pmo_err("send_lphb_enable is null");
@@ -42,7 +43,7 @@ QDF_STATUS pmo_tgt_send_lphb_enable(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send lphb enable");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -53,7 +54,7 @@ QDF_STATUS pmo_tgt_send_lphb_tcp_params(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_lphb_tcp_params) {
 		pmo_err("send_lphb_tcp_params is null");
@@ -64,7 +65,7 @@ QDF_STATUS pmo_tgt_send_lphb_tcp_params(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send lphb tcp params");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -75,7 +76,7 @@ QDF_STATUS pmo_tgt_send_lphb_tcp_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_lphb_tcp_filter_req) {
 		pmo_err("send_lphb_tcp_filter_req is null");
@@ -86,7 +87,7 @@ QDF_STATUS pmo_tgt_send_lphb_tcp_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send lphb tcp filter req");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -97,7 +98,7 @@ QDF_STATUS pmo_tgt_send_lphb_udp_params(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_lphb_upd_params) {
 		pmo_err("send_lphb_upd_params is null");
@@ -108,7 +109,7 @@ QDF_STATUS pmo_tgt_send_lphb_udp_params(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send lphb udp param");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -119,7 +120,7 @@ QDF_STATUS pmo_tgt_send_lphb_udp_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
 	if (!pmo_tx_ops.send_lphb_udp_filter_req) {
 		pmo_err("send_lphb_udp_filter_req is null");
@@ -130,7 +131,7 @@ QDF_STATUS pmo_tgt_send_lphb_udp_pkt_filter(struct wlan_objmgr_psoc *psoc,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to send lphb udp filter req");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_mc_addr_filtering.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -31,7 +32,7 @@ QDF_STATUS pmo_tgt_set_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -47,7 +48,7 @@ QDF_STATUS pmo_tgt_set_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to add/clear mc filter");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -59,7 +60,7 @@ QDF_STATUS pmo_tgt_clear_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -75,7 +76,7 @@ QDF_STATUS pmo_tgt_clear_mc_filter_req(struct wlan_objmgr_vdev *vdev,
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to add/clear mc filter");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -85,7 +86,7 @@ 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();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -105,7 +106,7 @@ 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();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -121,7 +122,7 @@ 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();
+	pmo_exit();
 
 	return status;
 }
@@ -133,7 +134,7 @@ 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();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -149,7 +150,7 @@ 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();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_ns.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for PMO NS offload feature to interact
  * with target/wmi.
@@ -36,7 +37,7 @@ 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();
+	pmo_enter();
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
 	psoc = pmo_vdev_get_psoc(vdev);
@@ -86,7 +87,7 @@ out:
 		qdf_mem_free(arp_offload_req);
 	if (ns_offload_req)
 		qdf_mem_free(ns_offload_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -101,7 +102,7 @@ QDF_STATUS pmo_tgt_disable_ns_offload_req(struct wlan_objmgr_vdev *vdev,
 	QDF_STATUS status;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -152,7 +153,7 @@ out:
 		qdf_mem_free(arp_offload_req);
 	if (ns_offload_req)
 		qdf_mem_free(ns_offload_req);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_pkt_filter.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -34,7 +35,7 @@ QDF_STATUS pmo_tgt_set_pkt_filter(struct wlan_objmgr_vdev *vdev,
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 	struct qdf_mac_addr peer_bssid;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
@@ -85,7 +86,7 @@ QDF_STATUS pmo_tgt_set_pkt_filter(struct wlan_objmgr_vdev *vdev,
 out:
 	if (request_buf)
 		qdf_mem_free(request_buf);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -100,7 +101,7 @@ QDF_STATUS pmo_tgt_clear_pkt_filter(struct wlan_objmgr_vdev *vdev,
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 	struct qdf_mac_addr peer_bssid;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = wlan_vdev_get_psoc(vdev);
 	if (!psoc) {
@@ -149,7 +150,7 @@ QDF_STATUS pmo_tgt_clear_pkt_filter(struct wlan_objmgr_vdev *vdev,
 out:
 	if (request_buf)
 		qdf_mem_free(request_buf);
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_static_config.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -32,7 +33,7 @@ QDF_STATUS pmo_tgt_send_enhance_multicast_offload_req(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	psoc = pmo_vdev_get_psoc(vdev);
 
 	pmo_tx_ops = GET_PMO_TX_OPS_FROM_PSOC(psoc);
@@ -46,7 +47,7 @@ QDF_STATUS pmo_tgt_send_enhance_multicast_offload_req(
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to config enhance multicast offload");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -62,7 +63,7 @@ QDF_STATUS pmo_tgt_send_ra_filter_req(struct wlan_objmgr_vdev *vdev)
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -91,7 +92,7 @@ QDF_STATUS pmo_tgt_send_ra_filter_req(struct wlan_objmgr_vdev *vdev)
 		pmo_decrement_wow_default_ptrn(vdev_ctx);
 	}
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -104,7 +105,7 @@ QDF_STATUS pmo_tgt_send_action_frame_pattern_req(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -119,7 +120,7 @@ QDF_STATUS pmo_tgt_send_action_frame_pattern_req(
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to add  filter");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_suspend_resume.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -31,7 +32,7 @@ QDF_STATUS pmo_tgt_vdev_update_param_req(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -45,7 +46,7 @@ QDF_STATUS pmo_tgt_vdev_update_param_req(struct wlan_objmgr_vdev *vdev,
 	status = pmo_tx_ops.send_vdev_param_update_req(vdev, param_id,
 			param_value);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -57,7 +58,7 @@ QDF_STATUS pmo_tgt_send_vdev_sta_ps_param(struct wlan_objmgr_vdev *vdev,
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -71,7 +72,7 @@ QDF_STATUS pmo_tgt_send_vdev_sta_ps_param(struct wlan_objmgr_vdev *vdev,
 	status = pmo_tx_ops.send_vdev_sta_ps_param_req(vdev, ps_param,
 			param_value);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }

components/pmo/dispatcher/src/wlan_pmo_tgt_wow.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 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
@@ -15,6 +15,7 @@
  * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  * PERFORMANCE OF THIS SOFTWARE.
  */
+
 /**
  * DOC: Implements public API for pmo to interact with target/WMI
  */
@@ -32,7 +33,7 @@ QDF_STATUS pmo_tgt_enable_wow_wakeup_event(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -46,7 +47,7 @@ QDF_STATUS pmo_tgt_enable_wow_wakeup_event(
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to enable wow wakeup event");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -59,7 +60,7 @@ QDF_STATUS pmo_tgt_disable_wow_wakeup_event(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 
 	psoc = pmo_vdev_get_psoc(vdev);
 
@@ -73,7 +74,7 @@ QDF_STATUS pmo_tgt_disable_wow_wakeup_event(
 	if (status != QDF_STATUS_SUCCESS)
 		pmo_err("Failed to disable wow wakeup event");
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -89,7 +90,7 @@ QDF_STATUS pmo_tgt_send_wow_patterns_to_fw(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	psoc = pmo_vdev_get_psoc(vdev);
 
 	vdev_ctx = pmo_vdev_get_priv(vdev);
@@ -114,7 +115,7 @@ QDF_STATUS pmo_tgt_send_wow_patterns_to_fw(
 	if (user)
 		pmo_increment_wow_user_ptrn(vdev_ctx);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }
@@ -128,7 +129,7 @@ QDF_STATUS pmo_tgt_del_wow_pattern(
 	struct wlan_objmgr_psoc *psoc;
 	struct wlan_pmo_tx_ops pmo_tx_ops;
 
-	PMO_ENTER();
+	pmo_enter();
 	psoc = pmo_vdev_get_psoc(vdev);
 	vdev_ctx = pmo_vdev_get_priv(vdev);
 
@@ -147,7 +148,7 @@ QDF_STATUS pmo_tgt_del_wow_pattern(
 	if (user)
 		pmo_decrement_wow_user_ptrn(vdev_ctx);
 out:
-	PMO_EXIT();
+	pmo_exit();
 
 	return status;
 }