diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 279211f8c6a6..28fe753e3ff5 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2505,7 +2505,7 @@ hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
 	bool fConnected = false;
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (NULL == roam_info) {
 		hdd_err("roam_info is NULL");
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 19f3d182f1a7..3a6eb00e2fe7 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -834,7 +834,7 @@ int wlan_hdd_send_avoid_freq_event(struct hdd_context *hdd_ctx,
 {
 	struct sk_buff *vendor_event;
 
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_ctx) {
 		hdd_err("HDD context is null");
@@ -931,7 +931,7 @@ int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx,
 	struct sk_buff *vendor_event;
 	enum qca_wlan_vendor_hang_reason hang_reason;
 
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_ctx) {
 		hdd_err("HDD context is null");
@@ -1013,7 +1013,7 @@ int wlan_hdd_send_avoid_freq_for_dnbs(struct hdd_context *hdd_ctx, uint8_t op_ch
 	int ret;
 	int chan;
 
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_ctx) {
 		hdd_err("invalid param");
@@ -2236,7 +2236,7 @@ int hdd_cfg80211_update_acs_config(struct hdd_adapter *adapter,
 		return -EINVAL;
 	}
 
-	ENTER();
+	hdd_enter();
 	sap_config = &adapter->session.ap.sap_config;
 	/* When first 2 connections are on the same frequency band,
 	 * then PCL would include only channels from the other
@@ -4102,7 +4102,7 @@ void hdd_chip_pwr_save_fail_detected_cb(void *hddctx,
 	struct sk_buff *skb;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -6092,7 +6092,7 @@ int wlan_hdd_send_roam_auth_event(struct hdd_adapter *adapter, uint8_t *bssid,
 	uint32_t fils_params_len;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx_ptr))
 		return -EINVAL;
@@ -8310,7 +8310,7 @@ void hdd_rssi_threshold_breached(void *hddctx,
 	struct hdd_context *hdd_ctx  = hddctx;
 	struct sk_buff *skb;
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -9618,7 +9618,7 @@ static void hdd_get_bpf_offload_cb(void *context,
 	struct hdd_request *request;
 	struct bpf_offload_priv *priv;
 
-	ENTER();
+	hdd_enter();
 
 	request = hdd_request_get(context);
 	if (!request) {
@@ -9645,7 +9645,7 @@ static int hdd_post_get_bpf_capabilities_rsp(struct hdd_context *hdd_ctx,
 	struct sk_buff *skb;
 	uint32_t nl_buf_len;
 
-	ENTER();
+	hdd_enter();
 
 	nl_buf_len = NLMSG_HDRLEN;
 	nl_buf_len +=
@@ -9696,7 +9696,7 @@ static int hdd_get_bpf_offload(struct hdd_context *hdd_ctx)
 		.timeout_ms = WLAN_WAIT_TIME_BPF,
 	};
 
-	ENTER();
+	hdd_enter();
 
 	request = hdd_request_alloc(&params);
 	if (!request) {
@@ -9754,7 +9754,7 @@ static int hdd_set_reset_bpf_offload(struct hdd_context *hdd_ctx,
 	int prog_len;
 	int ret = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
@@ -9868,7 +9868,7 @@ __wlan_hdd_cfg80211_bpf_offload(struct wiphy *wiphy,
 	struct nlattr *tb[BPF_MAX + 1];
 	int ret_val, packet_filter_subcmd;
 
-	ENTER();
+	hdd_enter();
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -10819,7 +10819,7 @@ __wlan_hdd_cfg80211_sap_configuration_set(struct wiphy *wiphy,
 	int ret;
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -11011,7 +11011,7 @@ static uint32_t hdd_send_wakelock_stats(struct hdd_context *hdd_ctx,
 	uint32_t ipv6_rx_multicast_addr_cnt;
 	uint32_t icmpv6_cnt;
 
-	ENTER();
+	hdd_enter();
 
 	nl_buf_len = NLMSG_HDRLEN;
 	nl_buf_len +=
@@ -11145,7 +11145,7 @@ static int __wlan_hdd_cfg80211_get_wakelock_stats(struct wiphy *wiphy,
 	struct sir_wake_lock_stats wake_lock_stats;
 	QDF_STATUS qdf_status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -11220,7 +11220,7 @@ __wlan_hdd_cfg80211_get_bus_size(struct wiphy *wiphy,
 	struct sk_buff *skb;
 	uint32_t nl_buf_len;
 
-	ENTER();
+	hdd_enter();
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -11301,7 +11301,7 @@ static int __wlan_hdd_cfg80211_setband(struct wiphy *wiphy,
 	static const struct nla_policy policy[QCA_WLAN_VENDOR_ATTR_MAX + 1]
 		= {[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE] = { .type = NLA_U32 } };
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -11597,7 +11597,7 @@ static int __wlan_hdd_cfg80211_update_vendor_channel(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	struct hdd_vendor_chan_info *channel_list_ptr;
 
-	ENTER();
+	hdd_enter();
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -11867,7 +11867,7 @@ static void hdd_sar_cb(void *cookie,
 	struct hdd_request *request;
 	struct hdd_sar_context *context;
 
-	ENTER();
+	hdd_enter();
 
 	if (!event) {
 		hdd_err("response is NULL");
@@ -12031,7 +12031,7 @@ static int __wlan_hdd_get_sar_power_limits(struct wiphy *wiphy,
 		.timeout_ms = WLAN_WAIT_TIME_SAR,
 	};
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -12118,7 +12118,7 @@ static int __wlan_hdd_set_sar_power_limits(struct wiphy *wiphy,
 	struct sar_limit_cmd_params sar_limit_cmd = {0};
 	int ret = -EINVAL, i = 0, rem = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -12466,7 +12466,7 @@ __wlan_hdd_cfg80211_set_trace_level(struct wiphy *wiphy,
 	int bit_mask = -1;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (hdd_get_conparam() == QDF_GLOBAL_FTM_MODE) {
 		hdd_err("Command not allowed in FTM mode");
@@ -12598,7 +12598,7 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
 	struct set_arp_stats_params arp_stats_params;
 	int err = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -12755,7 +12755,7 @@ static int __wlan_hdd_cfg80211_get_nud_stats(struct wiphy *wiphy,
 	void *soc = cds_get_context(QDF_MODULE_ID_SOC);
 	struct sk_buff *skb;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -12938,7 +12938,7 @@ static void hdd_get_chain_rssi_cb(void *context,
 	struct hdd_request *request;
 	struct chain_rssi_priv *priv;
 
-	ENTER();
+	hdd_enter();
 
 	request = hdd_request_get(context);
 	if (!request) {
@@ -13015,7 +13015,7 @@ static int __wlan_hdd_cfg80211_get_chain_rssi(struct wiphy *wiphy,
 		.timeout_ms = WLAN_WAIT_TIME_STATS,
 	};
 
-	ENTER();
+	hdd_enter();
 
 	retval = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != retval)
@@ -13120,7 +13120,7 @@ static int __wlan_hdd_cfg80211_set_limit_offchan_param(struct wiphy *wiphy,
 	uint8_t tos;
 	uint8_t tos_status;
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret < 0)
@@ -13268,7 +13268,7 @@ static int __wlan_hdd_cfg80211_fetch_bss_transition_status(struct wiphy *wiphy,
 							.type = NLA_U32},
 		};
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -13533,7 +13533,7 @@ int wlan_hdd_send_mode_change_event(void)
 	struct connection_info info[MAX_NUMBER_OF_CONC_CONNECTIONS];
 	uint32_t conn_count, mac_id;
 
-	ENTER();
+	hdd_enter();
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		hdd_err("HDD context is NULL");
@@ -14376,7 +14376,7 @@ struct hdd_context *hdd_cfg80211_wiphy_alloc(int priv_size)
 	struct wiphy *wiphy;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	wiphy = wiphy_new(&wlan_hdd_cfg80211_ops, priv_size);
 
@@ -14403,7 +14403,7 @@ int wlan_hdd_cfg80211_update_band(struct hdd_context *hdd_ctx, struct wiphy *wip
 	int i, j;
 	enum channel_state channelEnabledState;
 
-	ENTER();
+	hdd_enter();
 
 	for (i = 0; i < HDD_NUM_NL80211_BANDS; i++) {
 
@@ -14522,7 +14522,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 	int len = 0;
 	uint32_t *cipher_suites;
 
-	ENTER();
+	hdd_enter();
 
 	/* Now bind the underlying wlan device with wiphy */
 	set_wiphy_dev(wiphy, dev);
@@ -14895,7 +14895,7 @@ void wlan_hdd_update_11n_mode(struct hdd_config *cfg)
 /* In this function we are registering wiphy. */
 int wlan_hdd_cfg80211_register(struct wiphy *wiphy)
 {
-	ENTER();
+	hdd_enter();
 	/* Register our wiphy dev with cfg80211 */
 	if (0 > wiphy_register(wiphy)) {
 		hdd_err("wiphy register failed");
@@ -14943,7 +14943,7 @@ int wlan_hdd_cfg80211_register_frames(struct hdd_adapter *adapter)
 	uint16_t type = (SIR_MAC_MGMT_FRAME << 2) | (SIR_MAC_MGMT_ACTION << 4);
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	/* Register frame indication call back */
 	status = sme_register_mgmt_frame_ind_callback(hHal,
@@ -15042,7 +15042,7 @@ void wlan_hdd_cfg80211_deregister_frames(struct hdd_adapter *adapter)
 	/* Register for all P2P action, public action etc frames */
 	uint16_t type = (SIR_MAC_MGMT_FRAME << 2) | (SIR_MAC_MGMT_ACTION << 4);
 
-	ENTER();
+	hdd_enter();
 
 	/* Right now we are registering these frame when driver is getting
 	 * initialized. Once we will move to 2.6.37 kernel, in which we have
@@ -15256,7 +15256,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 	int ret = 0;
 	QDF_STATUS qdf_ret_status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -15325,7 +15325,7 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev,
 	struct wireless_dev *wdev;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	ENTER();
+	hdd_enter();
 
 	if (test_bit(ACS_IN_PROGRESS, &hdd_ctx->g_event_flags)) {
 		hdd_warn("ACS is in progress, don't change iface!");
@@ -15413,7 +15413,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 	struct hdd_config *pConfig = NULL;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -15671,7 +15671,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 	struct qdf_mac_addr STAMacAddress;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -15773,7 +15773,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 	QDF_STATUS qdf_ret_status;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -16104,7 +16104,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 	struct csr_roam_profile *roam_profile;
 	struct key_params params;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -16295,7 +16295,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -16702,7 +16702,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
 {
 	struct net_device *dev = adapter->dev;
 
-	ENTER();
+	hdd_enter();
 	hdd_debug("is going to notify supplicant of:");
 
 	if (NULL == roam_info) {
@@ -16735,7 +16735,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
 	unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
 	union iwreq_data wrqu;
 
-	ENTER();
+	hdd_enter();
 
 	if (NULL == adapter) {
 		hdd_err("adapter is NULL!");
@@ -16778,7 +16778,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
 	unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
 	union iwreq_data wrqu;
 
-	ENTER();
+	hdd_enter();
 
 	if (NULL == adapter) {
 		hdd_err("adapter is NULL!");
@@ -16827,7 +16827,7 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
 	unsigned char metrics_notification[MAX_LFR_METRICS_EVENT_LENGTH + 1];
 	union iwreq_data wrqu;
 
-	ENTER();
+	hdd_enter();
 
 	if (NULL == adapter) {
 		hdd_err("adapter is NULL!");
@@ -17109,7 +17109,7 @@ static int wlan_hdd_cfg80211_connect_start(struct hdd_adapter *adapter,
 	tSmeConfigParams *sme_config;
 	uint8_t channel = 0;
 
-	ENTER();
+	hdd_enter();
 
 	pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -18422,7 +18422,7 @@ static int wlan_hdd_cfg80211_set_privacy(struct hdd_adapter *adapter,
 		WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	struct hdd_station_ctx *sta_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	sta_ctx->wpa_versions = req->crypto.wpa_versions;
@@ -18752,7 +18752,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -18920,7 +18920,7 @@ int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason)
 	tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
 	uint32_t wait_time = WLAN_WAIT_TIME_DISCONNECT;
 
-	ENTER();
+	hdd_enter();
 
 	status = wlan_hdd_validate_context(hdd_ctx);
 
@@ -19103,7 +19103,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -19233,7 +19233,7 @@ static int wlan_hdd_cfg80211_set_privacy_ibss(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx =
 		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	sta_ctx->wpa_versions = 0;
 	qdf_mem_zero(&sta_ctx->ibss_enc_key, sizeof(tCsrRoamSetKey));
@@ -19339,7 +19339,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 	struct qdf_mac_addr bssid;
 	u8 channelNum = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -19547,7 +19547,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 	unsigned long rc;
 	tSirUpdateIE updateIE;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -19663,7 +19663,7 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
 	tHalHandle hHal = hdd_ctx->hHal;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -19787,7 +19787,7 @@ static int __wlan_hdd_set_default_mgmt_key(struct wiphy *wiphy,
 					 struct net_device *netdev,
 					 u8 key_index)
 {
-	ENTER();
+	hdd_enter();
 	return 0;
 }
 
@@ -19825,7 +19825,7 @@ static int __wlan_hdd_set_txq_params(struct wiphy *wiphy,
 				   struct net_device *dev,
 				   struct ieee80211_txq_params *params)
 {
-	ENTER();
+	hdd_enter();
 	return 0;
 }
 
@@ -19870,7 +19870,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 	uint8_t staId;
 	uint8_t *mac;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20107,7 +20107,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	u32 mask, set;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20289,7 +20289,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
 	int status;
 	tPmkidCacheInfo pmk_cache;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20386,7 +20386,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 	int status = 0;
 	tPmkidCacheInfo pmk_cache;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20474,7 +20474,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy,
 	tHalHandle halHandle;
 	int status = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20548,7 +20548,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	status = wlan_hdd_validate_context(hdd_ctx);
 	if (status)
@@ -20615,7 +20615,7 @@ void wlan_hdd_cfg80211_update_replay_counter_cb(
 	int i;
 	uint8_t *p;
 
-	ENTER();
+	hdd_enter();
 
 	if (!adapter) {
 		hdd_err("HDD adapter is Null");
@@ -20696,7 +20696,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
 	uint8_t *buf;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20792,7 +20792,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 	int status;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -20980,7 +20980,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
 	int err;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	err = wlan_hdd_validate_context(hdd_ctx);
 	if (err)
@@ -21288,7 +21288,7 @@ int wlan_hdd_change_hw_mode_for_given_chnl(struct hdd_adapter *adapter,
 	QDF_STATUS status;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 	if (0 != wlan_hdd_validate_context(hdd_ctx))
 		return -EINVAL;
 
@@ -21361,7 +21361,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 	int ret;
 	uint16_t chan_num = cds_freq_to_chan(chandef->chan->center_freq);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -21662,7 +21662,7 @@ static void wlan_hdd_chan_info_cb(struct scan_chan_info *info)
 	struct scan_chan_info *chan;
 	uint8_t idx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (wlan_hdd_validate_context(hdd_ctx) != 0) {
diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c
index a3f4c68a7aaf..0cfd2b45bdea 100644
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.c
@@ -73,7 +73,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 	char *pattern_mask;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
 		hdd_err("Invalid adapter or adapter has invalid magic");
@@ -196,7 +196,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	QDF_STATUS status;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = (struct hdd_adapter *)file->private_data;
 	if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
@@ -408,7 +408,7 @@ static void hdd_power_debugstats_cb(struct power_stats_response *response,
 	uint32_t *debug_registers;
 	uint32_t debug_registers_len;
 
-	ENTER();
+	hdd_enter();
 
 	request = hdd_request_get(context);
 	if (!request) {
@@ -471,7 +471,7 @@ static ssize_t __wlan_hdd_read_power_debugfs(struct file *file,
 		.dealloc = hdd_power_debugstats_dealloc,
 	};
 
-	ENTER();
+	hdd_enter();
 	adapter = (struct hdd_adapter *)file->private_data;
 	if ((!adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
 		hdd_err("Invalid adapter or adapter has invalid magic");
@@ -622,7 +622,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file)
 	struct hdd_context *hdd_ctx;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (inode->i_private)
 		file->private_data = inode->i_private;
diff --git a/core/hdd/src/wlan_hdd_debugfs_llstat.c b/core/hdd/src/wlan_hdd_debugfs_llstat.c
index 2a6141bac155..a028097a7b68 100644
--- a/core/hdd/src/wlan_hdd_debugfs_llstat.c
+++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c
@@ -52,7 +52,7 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
 	ssize_t len = 0;
 	uint8_t *buffer;
 
-	ENTER();
+	hdd_enter();
 
 	mutex_lock(&llstats_mutex);
 	if (!ll_stats.result) {
@@ -159,7 +159,7 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
 	ssize_t len = 0;
 	uint8_t *buffer;
 
-	ENTER();
+	hdd_enter();
 
 	mutex_lock(&llstats_mutex);
 	if (!ll_stats.result) {
@@ -224,7 +224,7 @@ void hdd_debugfs_process_radio_stats(struct hdd_adapter *adapter,
 	tSirWifiRadioStat *radio_stat = (tpSirWifiRadioStat) data;
 	tSirWifiChannelStats *chan_stat;
 
-	ENTER();
+	hdd_enter();
 
 	mutex_lock(&llstats_mutex);
 	if (!ll_stats.result) {
@@ -338,7 +338,7 @@ static ssize_t hdd_debugfs_stats_update(char __user *buf, size_t count,
 {
 	ssize_t ret_cnt;
 
-	ENTER();
+	hdd_enter();
 	mutex_lock(&llstats_mutex);
 	if (!ll_stats.result) {
 		mutex_unlock(&llstats_mutex);
@@ -371,7 +371,7 @@ static ssize_t __wlan_hdd_read_ll_stats_debugfs(struct file *file,
 	struct hdd_context *hdd_ctx;
 	ssize_t ret = 0;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = (struct hdd_adapter *)file->private_data;
 	if ((!adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
@@ -429,7 +429,7 @@ static int __wlan_hdd_open_ll_stats_debugfs(struct inode *inode,
 	struct hdd_context *hdd_ctx;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (inode->i_private)
 		file->private_data = inode->i_private;
@@ -493,7 +493,7 @@ static int __wlan_hdd_release_ll_stats_debugfs(struct inode *inode,
 	struct hdd_context *hdd_ctx;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (inode->i_private)
 		file->private_data = inode->i_private;
diff --git a/core/hdd/src/wlan_hdd_disa.c b/core/hdd/src/wlan_hdd_disa.c
index 442a62241336..7715c67d684e 100644
--- a/core/hdd/src/wlan_hdd_disa.c
+++ b/core/hdd/src/wlan_hdd_disa.c
@@ -58,7 +58,7 @@ static void hdd_encrypt_decrypt_msg_cb(void *cookie,
 	struct hdd_request *request;
 	struct hdd_encrypt_decrypt_msg_context *context;
 
-	ENTER();
+	hdd_enter();
 
 	if (!resp) {
 		hdd_err("rsp params is NULL");
@@ -118,7 +118,7 @@ static int hdd_post_encrypt_decrypt_msg_rsp(struct hdd_context *hdd_ctx,
 	struct sk_buff *skb;
 	uint32_t nl_buf_len;
 
-	ENTER();
+	hdd_enter();
 
 	nl_buf_len = resp->data_len + NLA_HDRLEN;
 
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 6efa7712d4ff..d74607d683fe 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -1260,7 +1260,7 @@ static int wlan_hdd_pld_probe(struct device *dev,
 static void wlan_hdd_pld_remove(struct device *dev,
 		     enum pld_bus_type bus_type)
 {
-	ENTER();
+	hdd_enter();
 	mutex_lock(&hdd_init_deinit_lock);
 	hdd_start_driver_ops_timer(eHDD_DRV_OP_REMOVE);
 
@@ -1281,7 +1281,7 @@ static void wlan_hdd_pld_remove(struct device *dev,
 static void wlan_hdd_pld_shutdown(struct device *dev,
 		       enum pld_bus_type bus_type)
 {
-	ENTER();
+	hdd_enter();
 	mutex_lock(&hdd_init_deinit_lock);
 	hdd_start_driver_ops_timer(eHDD_DRV_OP_SHUTDOWN);
 
@@ -1430,7 +1430,7 @@ static void wlan_hdd_purge_notifier(void)
 {
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
@@ -1511,7 +1511,7 @@ static void wlan_hdd_handle_the_pld_uevent(struct pld_uevent_data *uevent)
 static void wlan_hdd_pld_uevent(struct device *dev,
 				struct pld_uevent_data *uevent)
 {
-	ENTER();
+	hdd_enter();
 	hdd_info("pld event %d", uevent->uevent);
 
 	mutex_lock(&hdd_init_deinit_lock);
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 6fc0df6aa759..0da507555e52 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -207,7 +207,7 @@ wlan_hdd_cfg80211_extscan_get_capabilities_rsp(void *ctx,
 	struct hdd_ext_scan_context *context;
 	struct hdd_context *hdd_ctx  = ctx;
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -563,7 +563,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(void *ctx,
 	uint32_t i, index;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -701,7 +701,7 @@ wlan_hdd_cfg80211_extscan_signif_wifi_change_results_ind(
 	uint32_t i, j;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -964,7 +964,7 @@ wlan_hdd_cfg80211_extscan_scan_res_available_event(
 	struct sk_buff *skb = NULL;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -1102,7 +1102,7 @@ wlan_hdd_cfg80211_extscan_epno_match_found(void *ctx,
 	uint32_t len, i;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -1217,7 +1217,7 @@ wlan_hdd_cfg80211_passpoint_match_found(void *ctx,
 	struct nlattr *nla_aps, *nla_bss;
 	int flags = cds_get_gfp_flags();
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx))
 		return;
@@ -1346,7 +1346,7 @@ wlan_hdd_cfg80211_extscan_generic_rsp
 	struct hdd_context *hdd_ctx = ctx;
 	struct hdd_ext_scan_context *context;
 
-	ENTER();
+	hdd_enter();
 
 	if (wlan_hdd_validate_context(hdd_ctx) || !response) {
 		hdd_err("HDD context is not valid or response(%pK) is null",
diff --git a/core/hdd/src/wlan_hdd_fips.c b/core/hdd/src/wlan_hdd_fips.c
index 38c8b5d6659f..fc60d26aa019 100644
--- a/core/hdd/src/wlan_hdd_fips.c
+++ b/core/hdd/src/wlan_hdd_fips.c
@@ -86,7 +86,7 @@ static void hdd_fips_cb(void *cookie,
 	struct hdd_request *request;
 	struct hdd_fips_context *context;
 
-	ENTER();
+	hdd_enter();
 
 	if (!response) {
 		hdd_err("response is NULL");
diff --git a/core/hdd/src/wlan_hdd_he.c b/core/hdd/src/wlan_hdd_he.c
index 9e957c641411..9f57151d9709 100644
--- a/core/hdd/src/wlan_hdd_he.c
+++ b/core/hdd/src/wlan_hdd_he.c
@@ -313,7 +313,7 @@ __wlan_hdd_cfg80211_get_he_cap(struct wiphy *wiphy,
 	struct he_capability he_cap;
 	uint8_t he_supported = 0;
 
-	ENTER();
+	hdd_enter();
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
 		return -EPERM;
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 84a992614b16..56b52c1acf3c 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -841,7 +841,7 @@ static int hdd_stop_bss_link(struct hdd_adapter *adapter,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	dev = (struct net_device *)usrDataForCallback;
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	status = wlan_hdd_validate_context(hdd_ctx);
@@ -1117,7 +1117,7 @@ static void __wlan_hdd_sap_pre_cac_failure(void *data)
 	struct hdd_adapter *adapter;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = (struct hdd_adapter *) data;
 	if (!adapter ||
@@ -1168,7 +1168,7 @@ static void wlan_hdd_sap_pre_cac_success(void *data)
 	int i;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = (struct hdd_adapter *) data;
 	if (!adapter) {
@@ -2903,7 +2903,7 @@ void hdd_sap_restart_with_channel_switch(struct hdd_adapter *ap_adapter,
 	struct net_device *dev = ap_adapter->dev;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (!dev) {
 		hdd_err("Invalid dev pointer");
@@ -3097,7 +3097,7 @@ static int hdd_sap_get_chan_width(struct hdd_adapter *adapter, int *value)
 	struct sap_context *sap_ctx;
 	struct hdd_hostapd_state *hostapdstate;
 
-	ENTER();
+	hdd_enter();
 	hostapdstate = WLAN_HDD_GET_HOSTAP_STATE_PTR(adapter);
 
 	if (hostapdstate->bss_state != BSS_START) {
@@ -5271,7 +5271,7 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
 	int written;
 	uint8_t bc_sta_id;
 
-	ENTER();
+	hdd_enter();
 
 	bc_sta_id = WLAN_HDD_GET_AP_CTX_PTR(adapter)->broadcast_sta_id;
 
@@ -5490,7 +5490,7 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
 	int buf;
 	int length;
 
-	ENTER();
+	hdd_enter();
 
 	hddctx = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(hddctx);
@@ -6274,7 +6274,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 	int ret;
 	enum dfs_mode acs_dfs_mode;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_info("SSR in progress: %d", reinit);
 
@@ -6591,7 +6591,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 	tSmeConfigParams *sme_config;
 	tsap_Config_t *sap_config;
 
-	ENTER();
+	hdd_enter();
 
 
 	if (NULL == dev) {
@@ -6964,7 +6964,7 @@ wlan_hdd_cfg80211_alloc_new_beacon(struct hdd_adapter *adapter,
 	int head_len, tail_len, proberesp_ies_len, assocresp_ies_len;
 	const u8 *head, *tail, *proberesp_ies, *assocresp_ies;
 
-	ENTER();
+	hdd_enter();
 	if (params->head && !params->head_len) {
 		hdd_err("head_len is NULL");
 		return -EINVAL;
@@ -7677,7 +7677,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	enum dfs_mode mode;
 	struct hdd_adapter *sta_adapter;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_notify_teardown_tdls_links(adapter->hdd_vdev);
 
@@ -8380,7 +8380,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 	struct hdd_beacon_data *old;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -8687,7 +8687,8 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 	int status;
 	struct sme_sta_inactivity_timeout  *sta_inactivity_timer;
 	uint8_t channel;
-	ENTER();
+
+	hdd_enter();
 
 	clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
@@ -8950,7 +8951,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 	struct hdd_beacon_data *old, *new;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -9038,7 +9039,7 @@ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter)
 	int sta_id;
 	struct sap_context *sap_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
 	if (!sap_ctx) {
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 31553b3904d0..ef973cfe39ad 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -6927,7 +6927,7 @@ static int hdd_driver_command(struct hdd_adapter *adapter,
 	int ret = 0;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 4d5307a2cb6a..ec0eea713275 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3674,7 +3674,7 @@ static QDF_STATUS hdd_register_interface(struct hdd_adapter *adapter, bool rtnl_
 	struct net_device *dev = adapter->dev;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (rtnl_held) {
 		if (strnchr(dev->name, IFNAMSIZ - 1, '%')) {
@@ -4110,7 +4110,7 @@ void hdd_deinit_adapter(struct hdd_context *hdd_ctx,
 			struct hdd_adapter *adapter,
 			bool rtnl_held)
 {
-	ENTER();
+	hdd_enter();
 
 	switch (adapter->device_mode) {
 	case QDF_STA_MODE:
@@ -4814,7 +4814,7 @@ QDF_STATUS hdd_close_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 	struct hdd_adapter *adapter;
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	do {
 		status = hdd_remove_front_adapter(hdd_ctx, &adapter);
@@ -4891,7 +4891,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 	unsigned long rc;
 	tsap_Config_t *sap_config;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_debug("Disabling queues");
 	wlan_hdd_netif_queue_control(adapter,
@@ -5140,7 +5140,7 @@ void  hdd_deinit_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 {
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter)
 		hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held);
@@ -5152,7 +5152,7 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	cds_flush_work(&hdd_ctx->sap_pre_cac_work);
 
@@ -5197,7 +5197,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 	struct qdf_mac_addr peerMacAddr;
 	int sta_id;
 
-	ENTER();
+	hdd_enter();
 
 	cds_flush_work(&hdd_ctx->sap_pre_cac_work);
 
@@ -5708,7 +5708,7 @@ static int hdd_fils_update_connect_results(struct net_device *dev,
 			bool connect_timeout,
 			tSirResultCodes timeout_reason)
 {
-	ENTER();
+	hdd_enter();
 	if (!roam_info || !roam_info->is_fils_connection)
 		return -EINVAL;
 
@@ -5819,7 +5819,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 #endif
 	eConnectionState connState;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (!hdd_is_interface_up(adapter))
@@ -6191,7 +6191,7 @@ static inline QDF_STATUS hdd_unregister_wext_all_adapters(struct hdd_context *
 {
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (adapter->device_mode == QDF_STA_MODE ||
@@ -6214,7 +6214,7 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (adapter->device_mode == QDF_STA_MODE ||
@@ -6246,7 +6246,7 @@ static QDF_STATUS hdd_abort_sched_scan_all_adapters(struct hdd_context *hdd_ctx)
 	struct hdd_adapter *adapter;
 	int err;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (adapter->device_mode == QDF_STA_MODE ||
@@ -6562,7 +6562,7 @@ static void hdd_wlan_exit(struct hdd_context *hdd_ctx)
 	struct wiphy *wiphy = hdd_ctx->wiphy;
 	int driver_status;
 
-	ENTER();
+	hdd_enter();
 
 	qdf_cancel_delayed_work(&hdd_ctx->iface_idle_work);
 
@@ -6682,7 +6682,7 @@ void __hdd_wlan_exit(void)
 {
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
@@ -7610,7 +7610,7 @@ static QDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext,
 				    uint8_t sessionId, uint32_t scanId,
 				    eCsrScanStatus status)
 {
-	ENTER();
+	hdd_enter();
 
 	sme_scan_flush_result(halHandle);
 
@@ -8202,7 +8202,7 @@ void hdd_acs_response_timeout_handler(void *context)
 	struct hdd_context *hdd_ctx;
 	uint8_t reason;
 
-	ENTER();
+	hdd_enter();
 	if (!timer_context) {
 		hdd_err("invlaid timer context");
 		return;
@@ -8459,7 +8459,7 @@ static void hdd_iface_change_callback(void *priv)
 	if (status)
 		return;
 
-	ENTER();
+	hdd_enter();
 	hdd_debug("Interface change timer expired close the modules!");
 	ret = hdd_wlan_stop_modules(hdd_ctx, false);
 	if (ret)
@@ -8494,7 +8494,7 @@ static struct hdd_context *hdd_context_create(struct device *dev)
 	int ret = 0;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = hdd_cfg80211_wiphy_alloc(sizeof(struct hdd_context));
 	if (hdd_ctx == NULL) {
@@ -8720,7 +8720,7 @@ int hdd_start_ap_adapter(struct hdd_adapter *adapter)
 	int ret;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (test_bit(SME_SESSION_OPENED, &adapter->event_flags)) {
 		hdd_err("session is already opened, %d",
@@ -9673,7 +9673,7 @@ static void wlan_hdd_p2p_lo_event_callback(void *context_ptr,
 	struct sk_buff *vendor_event;
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	if (hdd_ctx == NULL) {
 		hdd_err("Invalid HDD context pointer");
@@ -9851,7 +9851,7 @@ static int hdd_features_init(struct hdd_context *hdd_ctx, struct hdd_adapter *ad
 	struct sme_5g_band_pref_params band_pref_params;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	/* FW capabilities received, Set the Dot11 mode */
 	sme_setdef_dot11mode(hdd_ctx->hHal);
@@ -10159,7 +10159,7 @@ static int hdd_deconfigure_cds(struct hdd_context *hdd_ctx)
 	QDF_STATUS qdf_status;
 	int ret = 0;
 
-	ENTER();
+	hdd_enter();
 
 	/* De-init features */
 	hdd_features_deinit(hdd_ctx);
@@ -10227,7 +10227,7 @@ int hdd_wlan_stop_modules(struct hdd_context *hdd_ctx, bool ftm_mode)
 	int active_threads;
 	struct target_psoc_info *tgt_hdl;
 
-	ENTER();
+	hdd_enter();
 	hdd_alert("stop WLAN module: entering driver status=%d",
 		  hdd_ctx->driver_status);
 
@@ -10535,7 +10535,7 @@ int hdd_wlan_startup(struct device *dev)
 	int ret;
 	bool rtnl_held;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = hdd_context_create(dev);
 
@@ -10731,7 +10731,7 @@ static void hdd_get_nud_stats_cb(void *data, struct rsp_stats *rsp)
 	int status;
 	struct hdd_adapter *adapter = NULL;
 
-	ENTER();
+	hdd_enter();
 
 	if (!rsp) {
 		hdd_err("data is null");
@@ -10784,7 +10784,7 @@ int hdd_register_cb(struct hdd_context *hdd_ctx)
 	QDF_STATUS status;
 	int ret = 0;
 
-	ENTER();
+	hdd_enter();
 
 	sme_register11d_scan_done_callback(hdd_ctx->hHal, hdd_11d_scan_done);
 
@@ -10868,7 +10868,7 @@ void hdd_deregister_cb(struct hdd_context *hdd_ctx)
 	QDF_STATUS status;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	sme_deregister_tx_queue_cb(hdd_ctx->hHal);
 	status = sme_deregister_for_dcc_stats_event(hdd_ctx->hHal);
@@ -10912,7 +10912,7 @@ QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter,
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAULT;
 
-	ENTER();
+	hdd_enter();
 
 	/* Ignore request to deauth bcmc station */
 	if (pDelStaParams->peerMacAddr.bytes[0] & 0x1)
@@ -10941,7 +10941,7 @@ void hdd_softap_sta_disassoc(struct hdd_adapter *adapter,
 	struct sir_peer_sta_info peer_sta_info;
 	struct hdd_station_info *stainfo;
 
-	ENTER();
+	hdd_enter();
 
 	/* Ignore request to disassoc bcmc station */
 	if (pDelStaParams->peerMacAddr.bytes[0] & 0x1)
@@ -11318,7 +11318,7 @@ static void __hdd_bus_bw_compute_timer_start(struct hdd_context *hdd_ctx)
 
 void hdd_bus_bw_compute_timer_start(struct hdd_context *hdd_ctx)
 {
-	ENTER();
+	hdd_enter();
 
 	if (hdd_bus_bw_compute_timer_is_running(hdd_ctx)) {
 		hdd_debug("Bandwidth compute timer already started");
@@ -11332,7 +11332,7 @@ void hdd_bus_bw_compute_timer_start(struct hdd_context *hdd_ctx)
 
 void hdd_bus_bw_compute_timer_try_start(struct hdd_context *hdd_ctx)
 {
-	ENTER();
+	hdd_enter();
 
 	if (hdd_bus_bw_compute_timer_is_running(hdd_ctx)) {
 		hdd_debug("Bandwidth compute timer already started");
@@ -11359,7 +11359,7 @@ static void __hdd_bus_bw_compute_timer_stop(struct hdd_context *hdd_ctx)
 
 void hdd_bus_bw_compute_timer_stop(struct hdd_context *hdd_ctx)
 {
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_bus_bw_compute_timer_is_running(hdd_ctx)) {
 		hdd_debug("Bandwidth compute timer already stopped");
@@ -11373,7 +11373,7 @@ void hdd_bus_bw_compute_timer_stop(struct hdd_context *hdd_ctx)
 
 void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx)
 {
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_bus_bw_compute_timer_is_running(hdd_ctx)) {
 		hdd_debug("Bandwidth compute timer already stopped");
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 37dba0a5dbc3..a4e51b71132e 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -88,7 +88,7 @@ static int hdd_close_ndi(struct hdd_adapter *adapter)
 	int errno;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	/* check if the adapter is in NAN Data mode */
 	if (QDF_NDI_MODE != adapter->device_mode) {
@@ -172,7 +172,7 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 		WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	struct csr_roam_profile *roam_profile = &wext_state->roamProfile;
 
-	ENTER();
+	hdd_enter();
 
 	if (!roam_profile) {
 		hdd_err("No valid roam profile");
@@ -331,7 +331,7 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 	int ret_val;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret_val = wlan_hdd_validate_context(hdd_ctx);
 	if (ret_val)
@@ -473,7 +473,7 @@ struct wlan_objmgr_vdev *hdd_ndi_open(char *iface_name)
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	uint8_t *ndi_mac_addr;
 
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_ctx) {
 		hdd_err("hdd_ctx null");
@@ -511,7 +511,7 @@ int hdd_ndi_start(uint8_t vdev_id)
 	struct hdd_adapter *adapter;
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
-	ENTER();
+	hdd_enter();
 
 	if (!hdd_ctx) {
 		hdd_err("hdd_ctx is null");
@@ -733,7 +733,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
 	struct bss_description tmp_bss_descp = {0};
 	struct csr_roam_info roam_info = {0};
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
@@ -794,7 +794,7 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id,
 	struct hdd_adapter *adapter;
 	struct hdd_station_ctx *sta_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c
index d9f0cc5826fe..57779546710c 100644
--- a/core/hdd/src/wlan_hdd_ocb.c
+++ b/core/hdd/src/wlan_hdd_ocb.c
@@ -2005,7 +2005,7 @@ static void wlan_hdd_dcc_stats_event_callback(void *context_ptr,
 	struct ocb_dcc_get_stats_response *resp = response_ptr;
 	struct sk_buff *vendor_event;
 
-	ENTER();
+	hdd_enter();
 
 	vendor_event =
 		cfg80211_vendor_event_alloc(hdd_ctx->wiphy,
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index b35743efadee..b6e9164b970e 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -147,7 +147,7 @@ int iw_get_oem_data_cap(struct net_device *dev,
 	struct hdd_context *pHddContext;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	pHddContext = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(pHddContext);
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index b16a0e72b69b..8a901bc3d729 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -134,7 +134,7 @@ static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
 	QDF_STATUS status;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -184,7 +184,7 @@ __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
 	struct net_device *dev = wdev->netdev;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -232,7 +232,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 	QDF_STATUS qdf_status;
 	int ret;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -316,7 +316,7 @@ static int __wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
 	struct net_device *dev = wdev->netdev;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -637,7 +637,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	int ret;
 	uint8_t session_type;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -850,7 +850,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 	struct hdd_adapter *pVirtAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index e850f17ad742..bcffcf9a2151 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -368,7 +368,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
 	struct pmo_ns_req *ns_req = NULL;
 	int err;
 
-	ENTER();
+	hdd_enter();
 	if (!psoc) {
 		hdd_err("psoc is NULL");
 		goto out;
@@ -435,7 +435,7 @@ void hdd_disable_ns_offload(struct hdd_adapter *adapter,
 {
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 	status = pmo_ucfg_flush_ns_offload_req(adapter->hdd_vdev);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Failed to flush NS Offload");
@@ -470,7 +470,7 @@ static void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
 	struct hdd_adapter *adapter;
 	int errno;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = container_of(work, struct hdd_adapter, ipv6_notifier_work);
 	errno = hdd_validate_adapter(adapter);
@@ -505,7 +505,7 @@ static void hdd_enable_hw_filter(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	status = pmo_ucfg_enable_hw_filter_in_fwr(adapter->hdd_vdev);
 	if (status != QDF_STATUS_SUCCESS)
@@ -518,7 +518,7 @@ static void hdd_disable_hw_filter(struct hdd_adapter *adapter)
 {
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	status = pmo_ucfg_disable_hw_filter_in_fwr(adapter->hdd_vdev);
 	if (status != QDF_STATUS_SUCCESS)
@@ -530,7 +530,7 @@ static void hdd_disable_hw_filter(struct hdd_adapter *adapter)
 void hdd_enable_host_offloads(struct hdd_adapter *adapter,
 	enum pmo_offload_trigger trigger)
 {
-	ENTER();
+	hdd_enter();
 
 	if (!ucfg_pmo_is_vdev_supports_offload(adapter->hdd_vdev)) {
 		hdd_info("offload is not supported on this vdev opmode: %d",
@@ -557,7 +557,7 @@ out:
 void hdd_disable_host_offloads(struct hdd_adapter *adapter,
 	enum pmo_offload_trigger trigger)
 {
-	ENTER();
+	hdd_enter();
 
 	if (!ucfg_pmo_is_vdev_supports_offload(adapter->hdd_vdev)) {
 		hdd_info("offload is not supported on this vdev opmode: %d",
@@ -733,7 +733,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 	struct csr_roam_profile *roam_profile;
 	struct in_ifaddr *ifa;
 
-	ENTER();
+	hdd_enter();
 
 	adapter = container_of(work, struct hdd_adapter, ipv4_notifier_work);
 	errno = hdd_validate_adapter(adapter);
@@ -904,7 +904,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
 	struct pmo_arp_req *arp_req = NULL;
 	struct in_ifaddr *ifa = NULL;
 
-	ENTER();
+	hdd_enter();
 	arp_req = qdf_mem_malloc(sizeof(*arp_req));
 	if (!arp_req) {
 		hdd_err("cannot allocate arp_req");
@@ -946,7 +946,7 @@ void hdd_disable_arp_offload(struct hdd_adapter *adapter,
 {
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 	status = pmo_ucfg_flush_arp_offload_req(adapter->hdd_vdev);
 	if (status != QDF_STATUS_SUCCESS) {
 		hdd_err("Failed to flush arp Offload");
@@ -971,7 +971,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 	QDF_STATUS status;
 	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
 
-	ENTER();
+	hdd_enter();
 	if (wlan_hdd_validate_context(hdd_ctx))
 		goto out;
 
@@ -991,7 +991,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
 
-	ENTER();
+	hdd_enter();
 	if (wlan_hdd_validate_context(hdd_ctx))
 		goto out;
 
@@ -1009,7 +1009,7 @@ int hdd_cache_mc_addr_list(struct pmo_mc_addr_list_params *mc_list_config)
 	QDF_STATUS status;
 	int ret = 0;
 
-	ENTER();
+	hdd_enter();
 	/* cache mc addr list */
 	status = pmo_ucfg_cache_mc_addr_list(mc_list_config);
 	if (status != QDF_STATUS_SUCCESS) {
@@ -1028,7 +1028,7 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 	struct wlan_objmgr_psoc *psoc = hdd_ctx->hdd_psoc;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	ENTER();
+	hdd_enter();
 	/* disable mc list first */
 	status = pmo_ucfg_disable_mc_addr_filtering_in_fwr(psoc,
 			adapter->session_id, trigger);
@@ -1212,7 +1212,7 @@ static void hdd_ssr_restart_sap(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (adapter->device_mode == QDF_SAP_MODE) {
@@ -1548,7 +1548,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	int exit_code;
 	p_cds_sched_context cds_sched_context = get_cds_sched_ctxt();
 
-	ENTER();
+	hdd_enter();
 
 	if (cds_is_driver_recovering()) {
 		hdd_debug("Driver is recovering; Skipping resume");
@@ -1664,7 +1664,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	struct hdd_scan_info *scan_info;
 	int rc;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -1891,7 +1891,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (timeout < 0) {
 		hdd_debug("User space timeout: %d; Enter full power or power save",
@@ -1980,7 +1980,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 	struct qdf_mac_addr selfMac = QDF_MAC_ADDR_BCAST_INIT;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
@@ -2075,7 +2075,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 	int status;
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c
index 08ef1cd711c2..588264cf5c91 100644
--- a/core/hdd/src/wlan_hdd_regulatory.c
+++ b/core/hdd/src/wlan_hdd_regulatory.c
@@ -625,7 +625,7 @@ void hdd_update_indoor_channel(struct hdd_context *hdd_ctx,
 	uint8_t band_capability;
 	struct wiphy *wiphy = hdd_ctx->wiphy;
 
-	ENTER();
+	hdd_enter();
 	hdd_debug("mark indoor channel disable: %d", disable);
 
 	band_capability = hdd_ctx->curr_band;
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 4e35da34a79a..06d262d8b487 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -96,7 +96,7 @@ static void hdd_vendor_scan_callback(struct hdd_adapter *adapter,
 	uint8_t scan_status;
 	uint64_t cookie;
 
-	ENTER();
+	hdd_enter();
 
 	if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) {
 		hdd_err("Invalid adapter magic");
@@ -430,7 +430,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	static uint32_t scan_ebusy_cnt;
 	struct scan_params params = {0};
 
-	ENTER();
+	hdd_enter();
 
 	if (cds_is_fw_down()) {
 		hdd_err("firmware is down, scan cmd cannot be processed");
@@ -1216,7 +1216,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 	tHalHandle hHal;
 	int ret = 0;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
diff --git a/core/hdd/src/wlan_hdd_spectralscan.c b/core/hdd/src/wlan_hdd_spectralscan.c
index 8f0d30eb91d5..f044d176fb1d 100644
--- a/core/hdd/src/wlan_hdd_spectralscan.c
+++ b/core/hdd/src/wlan_hdd_spectralscan.c
@@ -55,7 +55,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -93,7 +93,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_stop(struct wiphy *wiphy,
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -131,7 +131,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_config(
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -169,7 +169,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_diag_stats(
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -208,7 +208,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_cap_info(
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
@@ -247,7 +247,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_status(
 	int ret;
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 
-	ENTER();
+	hdd_enter();
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (ret)
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 959c362f1573..71c1a668860f 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -565,7 +565,7 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
 	struct nlattr *peers;
 	int numRate;
 
-	ENTER();
+	hdd_enter();
 
 	pWifiPeerStat = pData;
 
@@ -678,7 +678,7 @@ static void hdd_link_layer_process_iface_stats(struct hdd_adapter *adapter,
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	pWifiIfaceStat = pData;
 
@@ -916,7 +916,7 @@ static void hdd_link_layer_process_radio_stats(struct hdd_adapter *adapter,
 	tSirWifiRadioStat *pWifiRadioStat = pData;
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	status = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != status)
@@ -1343,7 +1343,7 @@ int wlan_hdd_ll_stats_get(struct hdd_adapter *adapter, uint32_t req_id,
 	struct hdd_station_ctx *hddstactx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_warn("Command not allowed in FTM mode");
@@ -2226,7 +2226,7 @@ void wlan_hdd_cfg80211_link_layer_stats_ext_callback(tHddHandle ctx,
 	uint8_t *results;
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (!ctx) {
 		hdd_err("Invalid HDD context.");
@@ -4858,7 +4858,7 @@ static int __wlan_hdd_get_rcpi(struct hdd_adapter *adapter,
 	};
 	bool reassoc;
 
-	ENTER();
+	hdd_enter();
 
 	/* initialize the rcpi value to zero, useful in error cases */
 	*rcpi_value = 0;
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index 99c482c605a5..d94ea5c1eae2 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -85,7 +85,7 @@ int wlan_hdd_tdls_get_all_peers(struct hdd_adapter *adapter,
 	int len;
 	struct hdd_context *hdd_ctx;
 
-	ENTER();
+	hdd_enter();
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	if (0 != (wlan_hdd_validate_context(hdd_ctx))) {
@@ -640,7 +640,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	int status;
 
-	ENTER();
+	hdd_enter();
 
 	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
 		hdd_err("Command not allowed in FTM mode");
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index a66ff69e54a3..56ce67a4cac6 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -3677,7 +3677,7 @@ QDF_STATUS wlan_hdd_get_snr(struct hdd_adapter *adapter, int8_t *snr)
 		.timeout_ms = WLAN_WAIT_TIME_STATS,
 	};
 
-	ENTER();
+	hdd_enter();
 
 	if (NULL == adapter) {
 		hdd_err("Invalid context, adapter");
@@ -4089,7 +4089,7 @@ void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
 	struct hdd_wext_state *pWextState =
 		WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	/* clear WPA/RSN/WSC IE information in the profile */
 	pWextState->roamProfile.nWPAReqIELength = 0;
@@ -4156,7 +4156,7 @@ int hdd_get_ldpc(struct hdd_adapter *adapter, int *value)
 	tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
 	int ret;
 
-	ENTER();
+	hdd_enter();
 	ret = sme_get_ht_config(hal, adapter->session_id,
 				WNI_CFG_HT_CAP_INFO_ADVANCE_CODING);
 	if (ret < 0) {
@@ -4223,7 +4223,7 @@ int hdd_get_tx_stbc(struct hdd_adapter *adapter, int *value)
 	tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
 	int ret;
 
-	ENTER();
+	hdd_enter();
 	ret = sme_get_ht_config(hal, adapter->session_id,
 				WNI_CFG_HT_CAP_INFO_TX_STBC);
 	if (ret < 0) {
@@ -4293,7 +4293,7 @@ int hdd_get_rx_stbc(struct hdd_adapter *adapter, int *value)
 	tHalHandle hal = WLAN_HDD_GET_HAL_CTX(adapter);
 	int ret;
 
-	ENTER();
+	hdd_enter();
 	ret = sme_get_ht_config(hal, adapter->session_id,
 				WNI_CFG_HT_CAP_INFO_RX_STBC);
 	if (ret < 0) {
@@ -4760,7 +4760,7 @@ static void hdd_get_class_a_statistics_cb(void *stats, void *context)
 	struct class_a_stats *priv;
 	tCsrGlobalClassAStatsInfo *returned_stats;
 
-	ENTER();
+	hdd_enter();
 	if ((NULL == stats) || (NULL == context)) {
 		hdd_err("Bad param, stats [%pK] context [%pK]",
 			stats, context);
@@ -5391,7 +5391,7 @@ static void hdd_get_temperature_cb(int temperature, void *context)
 	struct hdd_request *request;
 	struct temperature_priv *priv;
 
-	ENTER();
+	hdd_enter();
 
 	request = hdd_request_get(context);
 	if (!request) {
@@ -5427,7 +5427,7 @@ int wlan_hdd_get_temperature(struct hdd_adapter *adapter, int *temperature)
 		.timeout_ms = WLAN_WAIT_TIME_STATS,
 	};
 
-	ENTER();
+	hdd_enter();
 	if (NULL == adapter) {
 		hdd_err("adapter is NULL");
 		return -EPERM;
@@ -12074,7 +12074,7 @@ static int hdd_set_wext(struct hdd_adapter *adapter)
 	struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	ENTER();
+	hdd_enter();
 
 	if (!pwextBuf) {
 		hdd_err("ERROR: pwextBuf is NULL");
@@ -12151,7 +12151,7 @@ int hdd_register_wext(struct net_device *dev)
 	struct hdd_wext_state *pwextBuf = WLAN_HDD_GET_WEXT_STATE_PTR(adapter);
 	QDF_STATUS status;
 
-	ENTER();
+	hdd_enter();
 
 	if (!pwextBuf) {
 		hdd_err("ERROR: pwextBuf is NULL");
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index d7566bcf5026..4934af1f947a 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -1258,7 +1258,7 @@ QDF_STATUS hdd_wmm_init(struct hdd_adapter *adapter)
 	enum sme_qos_wmmuptype *dscp_to_up_map = adapter->dscp_to_up_map;
 	uint8_t dscp;
 
-	ENTER();
+	hdd_enter();
 
 	/* DSCP to User Priority Lookup Table
 	 * By default use the 3 Precedence bits of DSCP as the User Priority
@@ -1287,7 +1287,7 @@ QDF_STATUS hdd_wmm_adapter_init(struct hdd_adapter *adapter)
 	struct hdd_wmm_ac_status *pAcStatus;
 	sme_ac_enum_type acType;
 
-	ENTER();
+	hdd_enter();
 
 	adapter->hdd_wmm_status.wmmQap = false;
 	INIT_LIST_HEAD(&adapter->hdd_wmm_status.wmmContextList);
@@ -1325,7 +1325,7 @@ QDF_STATUS hdd_wmm_adapter_clear(struct hdd_adapter *adapter)
 	struct hdd_wmm_ac_status *pAcStatus;
 	sme_ac_enum_type acType;
 
-	ENTER();
+	hdd_enter();
 	for (acType = 0; acType < WLAN_MAX_AC; acType++) {
 		pAcStatus = &adapter->hdd_wmm_status.wmmAcStatus[acType];
 		pAcStatus->wmmAcAccessRequired = false;
@@ -1353,7 +1353,7 @@ QDF_STATUS hdd_wmm_adapter_close(struct hdd_adapter *adapter)
 {
 	struct hdd_wmm_qos_context *pQosContext;
 
-	ENTER();
+	hdd_enter();
 
 	/* free any context records that we still have linked */
 	while (!list_empty(&adapter->hdd_wmm_status.wmmContextList)) {
@@ -1402,7 +1402,7 @@ void hdd_wmm_classify_pkt(struct hdd_adapter *adapter,
 	 */
 
 #ifdef HDD_WMM_DEBUG
-	ENTER();
+	hdd_enter();
 #endif /* HDD_WMM_DEBUG */
 
 	pkt = skb->data;
@@ -1805,7 +1805,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 	 * enable UAPSD for any access categories
 	 */
 
-	ENTER();
+	hdd_enter();
 
 	if (roam_info->fReassocReq) {
 		/* when we reassociate we should continue to use
@@ -1921,7 +1921,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 	bool qosConnection;
 	uint8_t acmMask;
 
-	ENTER();
+	hdd_enter();
 
 	if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) &&
 	    roam_info && roam_info->u.pConnectedProfile) {