From e74003faac497b8dbc561bc2f2e42d426fa9de55 Mon Sep 17 00:00:00 2001
From: Dustin Brown <dustinb@codeaurora.org>
Date: Wed, 14 Mar 2018 12:51:58 -0700
Subject: [PATCH] qcacld-3.0: Rename ENTER/EXIT macros (part 3)

In order to better align with the rest of the driver, rename the
following macros:
 * ENTER -> hdd_enter
 * ENTER_DEV -> hdd_enter_dev
 * EXIT -> hdd_exit

For part 3, migrate usages of EXIT

Change-Id: I0868800b694c92d2ad157394d619c05f89dd222d
CRs-Fixed: 2205840
---
 core/hdd/src/wlan_hdd_assoc.c          |   2 +-
 core/hdd/src/wlan_hdd_cfg80211.c       | 106 ++++++++++++-------------
 core/hdd/src/wlan_hdd_debugfs.c        |   8 +-
 core/hdd/src/wlan_hdd_debugfs_llstat.c |  14 ++--
 core/hdd/src/wlan_hdd_disa.c           |   6 +-
 core/hdd/src/wlan_hdd_driver_ops.c     |   8 +-
 core/hdd/src/wlan_hdd_ext_scan.c       |  24 +++---
 core/hdd/src/wlan_hdd_fips.c           |   4 +-
 core/hdd/src/wlan_hdd_he.c             |   2 +-
 core/hdd/src/wlan_hdd_hostapd.c        |  72 ++++++++---------
 core/hdd/src/wlan_hdd_ioctl.c          |   6 +-
 core/hdd/src/wlan_hdd_main.c           |  86 ++++++++++----------
 core/hdd/src/wlan_hdd_nan_datapath.c   |  14 ++--
 core/hdd/src/wlan_hdd_oemdata.c        |   2 +-
 core/hdd/src/wlan_hdd_p2p.c            |   4 +-
 core/hdd/src/wlan_hdd_power.c          |  44 +++++-----
 core/hdd/src/wlan_hdd_regulatory.c     |   2 +-
 core/hdd/src/wlan_hdd_scan.c           |   6 +-
 core/hdd/src/wlan_hdd_softap_tx_rx.c   |   2 +-
 core/hdd/src/wlan_hdd_spectralscan.c   |  12 +--
 core/hdd/src/wlan_hdd_stats.c          |  22 ++---
 core/hdd/src/wlan_hdd_subnet_detect.c  |   2 +-
 core/hdd/src/wlan_hdd_tdls.c           |   4 +-
 core/hdd/src/wlan_hdd_wext.c           |  50 ++++++------
 core/hdd/src/wlan_hdd_wmm.c            |   4 +-
 25 files changed, 253 insertions(+), 253 deletions(-)

diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 70c7fe9647b5..faea1fac71cf 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2525,7 +2525,7 @@ hdd_roam_set_key_complete_handler(struct hdd_adapter *adapter,
 						    roamResult);
 	}
 
-	EXIT();
+	hdd_exit();
 	return QDF_STATUS_SUCCESS;
 }
 
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index a6ea883f7dbe..dbc82f93b068 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -861,7 +861,7 @@ int wlan_hdd_send_avoid_freq_event(struct hdd_context *hdd_ctx,
 
 	cfg80211_vendor_event(vendor_event, GFP_KERNEL);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -959,7 +959,7 @@ int wlan_hdd_send_hang_reason_event(struct hdd_context *hdd_ctx,
 
 	cfg80211_vendor_event(vendor_event, GFP_KERNEL);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4130,7 +4130,7 @@ void hdd_chip_pwr_save_fail_detected_cb(void *hddctx,
 		goto fail;
 
 	cfg80211_vendor_event(skb, flags);
-	EXIT();
+	hdd_exit();
 	return;
 
 fail:
@@ -4401,7 +4401,7 @@ static int __wlan_hdd_cfg80211_handle_wisa_cmd(struct wiphy *wiphy,
 				adapter->session_id),
 			wisa_mode);
 err:
-	EXIT();
+	hdd_exit();
 	return ret_val;
 }
 
@@ -5553,7 +5553,7 @@ __hdd_cfg80211_get_station_cmd(struct wiphy *wiphy,
 		status = -EINVAL;
 		goto out;
 	}
-	EXIT();
+	hdd_exit();
 out:
 	return status;
 }
@@ -7953,7 +7953,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 		goto fail;
 	}
 
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(add_req);
 	return 0;
 
@@ -8016,7 +8016,7 @@ wlan_hdd_del_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 		goto fail;
 	}
 
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(del_req);
 	return 0;
 
@@ -9655,7 +9655,7 @@ static int hdd_post_get_bpf_capabilities_rsp(struct hdd_context *hdd_ctx,
 	}
 
 	cfg80211_vendor_cmd_reply(skb);
-	EXIT();
+	hdd_exit();
 	return 0;
 
 nla_put_failure:
@@ -9717,7 +9717,7 @@ cleanup:
 	 * regardless we are done with the request.
 	 */
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -9824,7 +9824,7 @@ post_sme:
 		ret = -EINVAL;
 		goto fail;
 	}
-	EXIT();
+	hdd_exit();
 
 fail:
 	if (bpf_set_offload->current_length)
@@ -11098,7 +11098,7 @@ static uint32_t hdd_send_wakelock_stats(struct hdd_context *hdd_ctx,
 
 	cfg80211_vendor_cmd_reply(skb);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 
 nla_put_failure:
@@ -11152,7 +11152,7 @@ static int __wlan_hdd_cfg80211_get_wakelock_stats(struct wiphy *wiphy,
 	if (ret)
 		hdd_err("Failed to post wake lock stats");
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -11235,7 +11235,7 @@ __wlan_hdd_cfg80211_get_bus_size(struct wiphy *wiphy,
 
 	cfg80211_vendor_cmd_reply(skb);
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 
@@ -11306,7 +11306,7 @@ static int __wlan_hdd_cfg80211_setband(struct wiphy *wiphy,
 	ret = hdd_reg_set_band(dev,
 		nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_SETBAND_VALUE]));
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -11436,7 +11436,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
 	default:
 		hdd_info("invalid reason for timer invoke");
 	}
-	EXIT();
+	hdd_exit();
 	return qdf_status_to_os_return(status);
 }
 
@@ -11870,7 +11870,7 @@ static void hdd_sar_cb(void *cookie,
 	hdd_request_complete(request);
 	hdd_request_put(request);
 
-	EXIT();
+	hdd_exit();
 }
 
 static uint32_t hdd_sar_get_response_len(const struct sar_limit_event *event)
@@ -12366,7 +12366,7 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy,
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -12511,7 +12511,7 @@ __wlan_hdd_cfg80211_set_trace_level(struct wiphy *wiphy,
 				bit_mask, module_id);
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -12636,7 +12636,7 @@ static int __wlan_hdd_cfg80211_set_nud_stats(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return err;
 }
@@ -13054,7 +13054,7 @@ static int __wlan_hdd_cfg80211_get_chain_rssi(struct wiphy *wiphy,
 	}
 	hdd_request_put(request);
 
-	EXIT();
+	hdd_exit();
 	return retval;
 }
 
@@ -13369,7 +13369,7 @@ static int __wlan_hdd_cfg80211_fetch_bss_transition_status(struct wiphy *wiphy,
 	}
 	nla_nest_end(reply_skb, attr);
 
-	EXIT();
+	hdd_exit();
 
 	return cfg80211_vendor_cmd_reply(reply_skb);
 }
@@ -13558,7 +13558,7 @@ int wlan_hdd_send_mode_change_event(void)
 	nla_nest_end(skb, attr);
 
 	cfg80211_vendor_event(skb, GFP_KERNEL);
-	EXIT();
+	hdd_exit();
 
 	return err;
 }
@@ -14757,7 +14757,7 @@ int wlan_hdd_cfg80211_init(struct device *dev,
 	if (pCfg->enable_mac_spoofing)
 		wlan_hdd_cfg80211_scan_randomization_init(wiphy);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 
 mem_fail:
@@ -14887,7 +14887,7 @@ int wlan_hdd_cfg80211_register(struct wiphy *wiphy)
 		return -EIO;
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -15286,7 +15286,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 			ret = -EINVAL;
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -15345,7 +15345,7 @@ static int wlan_hdd_change_client_iface_to_new_mode(struct net_device *ndev,
 		wext->roamProfile.phyMode =
 			hdd_cfg_xlate_to_csr_phy_mode(config->dot11Mode);
 	}
-	EXIT();
+	hdd_exit();
 
 	return qdf_status_to_os_return(status);
 }
@@ -15581,7 +15581,7 @@ done:
 
 	hdd_lpass_notify_mode_change(adapter);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -15703,7 +15703,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 #endif
 		}
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -16053,7 +16053,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			}
 		}
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -16172,7 +16172,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 	params.key = &roam_profile->Keys.KeyMaterial[key_index][0];
 	callback(cookie, &params);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -16219,7 +16219,7 @@ static int __wlan_hdd_cfg80211_del_key(struct wiphy *wiphy,
 				     u8 key_index,
 				     bool pairwise, const u8 *mac_addr)
 {
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -16414,7 +16414,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -16740,7 +16740,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth(struct hdd_adapter *adapter,
 	wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
 			    metrics_notification);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -16791,7 +16791,7 @@ wlan_hdd_cfg80211_roam_metrics_preauth_status(struct hdd_adapter *adapter,
 	wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
 			    metrics_notification);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -16833,7 +16833,7 @@ wlan_hdd_cfg80211_roam_metrics_handover(struct hdd_adapter *adapter,
 	wireless_send_event(adapter->dev, IWEVCUSTOM, &wrqu,
 			    metrics_notification);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -17419,7 +17419,7 @@ conn_failure:
 	hdd_set_connection_in_progress(false);
 
 ret_status:
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -18868,7 +18868,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 		hdd_err("connect failed");
 		return status;
 	}
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -19481,7 +19481,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		hdd_err("connect failed");
 		return status;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -19604,7 +19604,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 		return -ETIMEDOUT;
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -19735,7 +19735,7 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
 			hdd_debug("set short retry count %hu", retry_value);
 		}
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -19990,7 +19990,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 	}
 
 fn_end:
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -20122,7 +20122,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 							     dev, mac);
 	}
 #endif
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -20326,7 +20326,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
 	sme_set_del_pmkid_cache(halHandle, adapter->session_id,
 					&pmk_cache, true);
 
-	EXIT();
+	hdd_exit();
 	return QDF_IS_STATUS_SUCCESS(result) ? 0 : -EINVAL;
 }
 
@@ -20416,7 +20416,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 
 	sme_set_del_pmkid_cache(halHandle, adapter->session_id, &pmk_cache,
 						false);
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -20489,7 +20489,7 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy,
 	}
 
 	sme_set_del_pmkid_cache(halHandle, adapter->session_id, NULL, false);
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -20562,7 +20562,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 	/* Pass the received FT IEs to SME */
 	sme_set_ft_ies(WLAN_HDD_GET_HAL_CTX(adapter), adapter->session_id,
 		       (const u8 *)ftie->ie, ftie->ie_len);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -20628,7 +20628,7 @@ void wlan_hdd_cfg80211_update_replay_counter_cb(
 					gtk_rsp_param->bssid.bytes,
 					temp_replay_counter, GFP_KERNEL);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -20726,7 +20726,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
 out:
 	if (gtk_req)
 		qdf_mem_free(gtk_req);
-	EXIT();
+	hdd_exit();
 
 	return result;
 }
@@ -20868,7 +20868,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 			adapter->device_mode);
 		return -EINVAL;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -21049,7 +21049,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
 		return -EOPNOTSUPP;
 	}
 
-	EXIT();
+	hdd_exit();
 	return err;
 }
 
@@ -21313,7 +21313,7 @@ int wlan_hdd_change_hw_mode_for_given_chnl(struct hdd_adapter *adapter,
 		break;
 
 	}
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -21397,7 +21397,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 		ret = qdf_status_to_os_return(status);
 		return ret;
 	}
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -21675,7 +21675,7 @@ static void wlan_hdd_chan_info_cb(struct scan_chan_info *info)
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c
index 960bc0c7ef58..a3f4c68a7aaf 100644
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.c
@@ -143,7 +143,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 
 	hdd_add_wowl_ptrn_debugfs(adapter, pattern_idx, pattern_offset,
 				  pattern_buf, pattern_mask);
-	EXIT();
+	hdd_exit();
 	return count;
 }
 
@@ -357,7 +357,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	}
 	qdf_mem_free(cmd);
 	qdf_mem_free(addPeriodicTxPtrnParams);
-	EXIT();
+	hdd_exit();
 	return count;
 
 failure:
@@ -438,7 +438,7 @@ static void hdd_power_debugstats_cb(struct power_stats_response *response,
 	}
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -637,7 +637,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file)
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret)
 		return ret;
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
diff --git a/core/hdd/src/wlan_hdd_debugfs_llstat.c b/core/hdd/src/wlan_hdd_debugfs_llstat.c
index ce1389664aef..2a6141bac155 100644
--- a/core/hdd/src/wlan_hdd_debugfs_llstat.c
+++ b/core/hdd/src/wlan_hdd_debugfs_llstat.c
@@ -147,7 +147,7 @@ void hdd_debugfs_process_iface_stats(struct hdd_adapter *adapter,
 
 	ll_stats.len += len;
 	mutex_unlock(&llstats_mutex);
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
@@ -211,7 +211,7 @@ void hdd_debugfs_process_peer_stats(struct hdd_adapter *adapter, void *data)
 	}
 	ll_stats.len += len;
 	mutex_unlock(&llstats_mutex);
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -291,7 +291,7 @@ void hdd_debugfs_process_radio_stats(struct hdd_adapter *adapter,
 	}
 	ll_stats.len += len;
 	mutex_unlock(&llstats_mutex);
-	EXIT();
+	hdd_exit();
 }
 
 static inline void wlan_hdd_llstats_free_buf(void)
@@ -351,7 +351,7 @@ static ssize_t hdd_debugfs_stats_update(char __user *buf, size_t count,
 	mutex_unlock(&llstats_mutex);
 	hdd_debug("LL stats read req: count: %zu, pos: %lld", count, *pos);
 
-	EXIT();
+	hdd_exit();
 	return ret_cnt;
 }
 
@@ -388,7 +388,7 @@ static ssize_t __wlan_hdd_read_ll_stats_debugfs(struct file *file,
 	ret = hdd_debugfs_stats_update(buf, count, pos);
 	hdd_info("%zu characters written into debugfs", ret);
 
-	EXIT();
+	hdd_exit();
 	return ret;
 
 }
@@ -454,7 +454,7 @@ static int __wlan_hdd_open_ll_stats_debugfs(struct inode *inode,
 	if (0 != ret)
 		return ret;
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -511,7 +511,7 @@ static int __wlan_hdd_release_ll_stats_debugfs(struct inode *inode,
 
 	wlan_hdd_llstats_free_buf();
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
diff --git a/core/hdd/src/wlan_hdd_disa.c b/core/hdd/src/wlan_hdd_disa.c
index 9ef943d0c794..442a62241336 100644
--- a/core/hdd/src/wlan_hdd_disa.c
+++ b/core/hdd/src/wlan_hdd_disa.c
@@ -103,7 +103,7 @@ static void hdd_encrypt_decrypt_msg_cb(void *cookie,
 
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -137,7 +137,7 @@ static int hdd_post_encrypt_decrypt_msg_rsp(struct hdd_context *hdd_ctx,
 	}
 
 	cfg80211_vendor_cmd_reply(skb);
-	EXIT();
+	hdd_exit();
 	return 0;
 
 nla_put_failure:
@@ -413,7 +413,7 @@ static int hdd_encrypt_decrypt_msg(struct hdd_adapter *adapter,
 cleanup:
 	hdd_request_put(request);
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 8e482be71700..8507d75f3a85 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -1255,7 +1255,7 @@ static void wlan_hdd_pld_remove(struct device *dev,
 
 	hdd_stop_driver_ops_timer();
 	mutex_unlock(&hdd_init_deinit_lock);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -1276,7 +1276,7 @@ static void wlan_hdd_pld_shutdown(struct device *dev,
 
 	hdd_stop_driver_ops_timer();
 	mutex_unlock(&hdd_init_deinit_lock);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -1431,7 +1431,7 @@ static void wlan_hdd_purge_notifier(void)
 	cds_shutdown_notifier_call();
 	cds_shutdown_notifier_purge();
 	mutex_unlock(&hdd_ctx->iface_change_lock);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -1507,7 +1507,7 @@ static void wlan_hdd_pld_uevent(struct device *dev,
 	mutex_unlock(&hdd_init_deinit_lock);
 
 	wlan_hdd_purge_notifier();
-	EXIT();
+	hdd_exit();
 }
 
 #ifdef FEATURE_RUNTIME_PM
diff --git a/core/hdd/src/wlan_hdd_ext_scan.c b/core/hdd/src/wlan_hdd_ext_scan.c
index 34662b55c4c9..6fc0df6aa759 100644
--- a/core/hdd/src/wlan_hdd_ext_scan.c
+++ b/core/hdd/src/wlan_hdd_ext_scan.c
@@ -671,7 +671,7 @@ wlan_hdd_cfg80211_extscan_hotlist_match_ind(void *ctx,
 	}
 
 	cfg80211_vendor_event(skb, flags);
-	EXIT();
+	hdd_exit();
 	return;
 
 fail:
@@ -998,7 +998,7 @@ wlan_hdd_cfg80211_extscan_scan_res_available_event(
 	}
 
 	cfg80211_vendor_event(skb, flags);
-	EXIT();
+	hdd_exit();
 	return;
 
 nla_put_failure:
@@ -1707,7 +1707,7 @@ static int __wlan_hdd_cfg80211_extscan_get_capabilities(struct wiphy *wiphy,
 	ret = wlan_hdd_send_ext_scan_capability(hdd_ctx);
 	if (ret)
 		hdd_err("Failed to send ext scan capability to user space");
-	EXIT();
+	hdd_exit();
 	return ret;
 fail:
 	qdf_mem_free(pReqMsg);
@@ -2090,7 +2090,7 @@ __wlan_hdd_cfg80211_extscan_set_bssid_hotlist(struct wiphy *wiphy,
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -2332,7 +2332,7 @@ __wlan_hdd_cfg80211_extscan_set_significant_change(struct wiphy *wiphy,
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -3279,7 +3279,7 @@ __wlan_hdd_cfg80211_extscan_start(struct wiphy *wiphy,
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -3421,7 +3421,7 @@ __wlan_hdd_cfg80211_extscan_stop(struct wiphy *wiphy,
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -3554,7 +3554,7 @@ __wlan_hdd_cfg80211_extscan_reset_bssid_hotlist(struct wiphy *wiphy,
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -3686,7 +3686,7 @@ __wlan_hdd_cfg80211_extscan_reset_significant_change(struct wiphy
 			retval = -EINVAL;
 		spin_unlock(&context->context_lock);
 	}
-	EXIT();
+	hdd_exit();
 	return retval;
 
 fail:
@@ -3989,7 +3989,7 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
 		goto fail;
 	}
 
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(req_msg);
 	return 0;
 
@@ -4214,7 +4214,7 @@ static int __wlan_hdd_cfg80211_set_passpoint_list(struct wiphy *wiphy,
 		goto fail;
 	}
 
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(req_msg);
 	return 0;
 
@@ -4315,7 +4315,7 @@ static int __wlan_hdd_cfg80211_reset_passpoint_list(struct wiphy *wiphy,
 		goto fail;
 	}
 
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(req_msg);
 	return 0;
 
diff --git a/core/hdd/src/wlan_hdd_fips.c b/core/hdd/src/wlan_hdd_fips.c
index 367ac0356382..38c8b5d6659f 100644
--- a/core/hdd/src/wlan_hdd_fips.c
+++ b/core/hdd/src/wlan_hdd_fips.c
@@ -116,7 +116,7 @@ static void hdd_fips_cb(void *cookie,
 
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 }
 
 static void hdd_fips_context_dealloc(void *priv)
@@ -273,7 +273,7 @@ static int __hdd_fips_test(struct net_device *dev,
 cleanup:
 	hdd_request_put(request);
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
diff --git a/core/hdd/src/wlan_hdd_he.c b/core/hdd/src/wlan_hdd_he.c
index 4c02b04918f8..9e957c641411 100644
--- a/core/hdd/src/wlan_hdd_he.c
+++ b/core/hdd/src/wlan_hdd_he.c
@@ -382,7 +382,7 @@ __wlan_hdd_cfg80211_get_he_cap(struct wiphy *wiphy,
 		goto nla_put_failure;
 end:
 	ret = cfg80211_vendor_cmd_reply(reply_skb);
-	EXIT();
+	hdd_exit();
 	return ret;
 
 nla_put_failure:
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 9c8da55fb0e2..66719ab122de 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -470,7 +470,7 @@ static int __hdd_hostapd_open(struct net_device *dev)
 	wlan_hdd_netif_queue_control(adapter,
 				   WLAN_START_ALL_NETIF_QUEUE_N_CARRIER,
 				   WLAN_CONTROL_PATH);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -531,7 +531,7 @@ static int __hdd_hostapd_stop(struct net_device *dev)
 				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
 				     WLAN_CONTROL_PATH);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -587,7 +587,7 @@ static void __hdd_hostapd_uninit(struct net_device *dev)
 	adapter->dev = NULL;
 	adapter->magic = 0;
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -706,7 +706,7 @@ static int __hdd_hostapd_set_mac_address(struct net_device *dev, void *addr)
 	}
 
 	memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -785,7 +785,7 @@ static void hdd_hostapd_inactivity_timer_cb(void *context)
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			hdd_err("Failed to init AP inactivity timer");
 
-		EXIT();
+		hdd_exit();
 		return;
 	}
 #endif /* DISABLE_CONCURRENCY_AUTOSAVE */
@@ -798,7 +798,7 @@ static void hdd_hostapd_inactivity_timer_cb(void *context)
 	hdd_debug("Shutting down AP interface due to inactivity");
 	wireless_send_event(dev, IWEVCUSTOM, &wrqu, (char *)we_custom_event);
 
-	EXIT();
+	hdd_exit();
 }
 
 static void hdd_clear_sta(struct hdd_adapter *adapter, uint8_t sta_id)
@@ -862,7 +862,7 @@ static int hdd_stop_bss_link(struct hdd_adapter *adapter,
 		hdd_start_green_ap_state_mc(hdd_ctx, adapter->device_mode,
 					    false);
 	}
-	EXIT();
+	hdd_exit();
 	return (status == QDF_STATUS_SUCCESS) ? 0 : -EBUSY;
 }
 
@@ -3073,7 +3073,7 @@ static int __iw_softap_set_ini_cfg(struct net_device *dev,
 	status = hdd_execute_global_config_command(hdd_ctx, value);
 	qdf_mem_free(value);
 
-	EXIT();
+	hdd_exit();
 
 	return qdf_status_to_os_return(status);
 }
@@ -4025,7 +4025,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		ret = -EINVAL;
 		break;
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -4349,7 +4349,7 @@ static __iw_softap_getparam(struct net_device *dev,
 		break;
 
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -4428,7 +4428,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 		hdd_err("Modify ACL failed");
 		ret = -EIO;
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -4471,7 +4471,7 @@ static __iw_softap_getchannel(struct net_device *dev,
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags))
 		*value = (WLAN_HDD_GET_AP_CTX_PTR(
 					adapter))->operating_channel;
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4527,7 +4527,7 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
 		hdd_err("Setting maximum tx power failed");
 		return -EIO;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4618,7 +4618,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 		hdd_err("Setting tx power failed");
 		return -EIO;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4716,7 +4716,7 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 		ret = -EFAULT;
 	}
 	qdf_mem_free(buf);
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -4787,7 +4787,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 			&del_sta_params);
 	hdd_softap_sta_disassoc(adapter, &del_sta_params);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4845,7 +4845,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		break;
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -4990,7 +4990,7 @@ static int __iw_get_channel_list(struct net_device *dev,
 	hdd_debug("number of channels %d", num_channels);
 
 	channel_list->num_channels = num_channels;
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -5052,7 +5052,7 @@ int __iw_get_genie(struct net_device *dev,
 		hdd_debug(" RSN IE failed to populate");
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -5132,7 +5132,7 @@ static int __iw_get_ap_freq(struct net_device *dev,
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -5206,7 +5206,7 @@ __iw_softap_stopbss(struct net_device *dev,
 					    false);
 		ret = qdf_status_to_os_return(status);
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -5245,7 +5245,7 @@ __iw_softap_version(struct net_device *dev,
 		return ret;
 
 	hdd_wlan_get_version(hdd_ctx, wrqu, extra);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -5300,7 +5300,7 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
 				     sta->ecsa_capable);
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -5337,7 +5337,7 @@ static int __iw_softap_get_sta_info(struct net_device *dev,
 
 	wrqu->data.length = strlen(extra);
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -5443,7 +5443,7 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 		hdd_err("Unable to encode link speed");
 		return -EIO;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -5547,7 +5547,7 @@ __iw_get_peer_rssi(struct net_device *dev, struct iw_request_info *info,
 	}
 	wrqu->data.length = length + 1;
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -6356,7 +6356,7 @@ QDF_STATUS hdd_init_ap_mode(struct hdd_adapter *adapter, bool reinit)
 	/* rcpi info initialization */
 	qdf_mem_zero(&adapter->rcpi, sizeof(adapter->rcpi));
 
-	EXIT();
+	hdd_exit();
 
 	return status;
 
@@ -6367,7 +6367,7 @@ error_release_sap_session:
 error_release_vdev:
 	QDF_BUG(!hdd_vdev_destroy(adapter));
 
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -6401,7 +6401,7 @@ void hdd_deinit_ap_mode(struct hdd_context *hdd_ctx,
 	if (hdd_hostapd_deinit_sap_session(adapter))
 		hdd_err("Failed:hdd_hostapd_deinit_sap_session");
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -6743,7 +6743,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 		hdd_err("Invalid device mode failed to set valid channel");
 		return -EINVAL;
 	}
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -8236,7 +8236,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		/* Bss already started. just return. */
 		/* TODO Probably it should update some beacon params. */
 		hdd_debug("Bss Already started...Ignore the request");
-		EXIT();
+		hdd_exit();
 		ret = 0;
 		goto free;
 	}
@@ -8315,7 +8315,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	hdd_unsafe_channel_restart_sap(hdd_ctx);
 
 	hdd_set_connection_in_progress(false);
-	EXIT();
+	hdd_exit();
 
 	ret = 0;
 	goto free;
@@ -8534,7 +8534,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 
 	ucfg_p2p_status_stop_bss(adapter->hdd_vdev);
 
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -8907,7 +8907,7 @@ err_start_bss:
 	adapter->session.ap.beacon = NULL;
 
 success:
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -8999,7 +8999,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 	status = wlan_hdd_cfg80211_start_bss(adapter, params, NULL,
 					0, 0, false);
 
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -9072,7 +9072,7 @@ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter)
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 }
 
 bool hdd_is_peer_associated(struct hdd_adapter *adapter,
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 08c087da0381..c3b5eca834c4 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -175,7 +175,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics,
 	priv->tsm_metrics = tsm_metrics;
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -6978,7 +6978,7 @@ static int hdd_driver_command(struct hdd_adapter *adapter,
 exit:
 	if (command)
 		qdf_mem_free(command);
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -7098,7 +7098,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 		break;
 	}
 exit:
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 1e77d35bea50..6a791bc8be0e 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -2393,7 +2393,7 @@ int hdd_start_adapter(struct hdd_adapter *adapter)
 	wlan_hdd_update_dbs_scan_and_fw_mode_config();
 
 exit_with_success:
-	EXIT();
+	hdd_exit();
 
 	return 0;
 
@@ -2695,7 +2695,7 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
 	if (hdd_ctx->driver_status == DRIVER_MODULES_ENABLED) {
 		mutex_unlock(&hdd_ctx->iface_change_lock);
 		hdd_info("Driver modules already Enabled");
-		EXIT();
+		hdd_exit();
 		return 0;
 	}
 
@@ -2858,7 +2858,7 @@ int hdd_wlan_start_modules(struct hdd_context *hdd_ctx,
 	}
 	mutex_unlock(&hdd_ctx->iface_change_lock);
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 
@@ -2897,7 +2897,7 @@ release_lock:
 		hdd_check_for_leaks();
 	hdd_debug_domain_set(QDF_DEBUG_DOMAIN_INIT);
 
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -3168,7 +3168,7 @@ static int __hdd_stop(struct net_device *dev)
 			WIFI_POWER_EVENT_WAKELOCK_IFACE_CHANGE_TIMER);
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -3229,7 +3229,7 @@ static void __hdd_uninit(struct net_device *dev)
 		adapter->magic = 0;
 	} while (0);
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -3332,7 +3332,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 	memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
 	memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN);
 
-	EXIT();
+	hdd_exit();
 	return qdf_ret_status;
 }
 
@@ -3480,7 +3480,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 out:
 	if (mc_list_request)
 		qdf_mem_free(mc_list_request);
-	EXIT();
+	hdd_exit();
 }
 
 
@@ -3699,7 +3699,7 @@ static QDF_STATUS hdd_register_interface(struct hdd_adapter *adapter, bool rtnl_
 	}
 	set_bit(NET_DEVICE_REGISTERED, &adapter->event_flags);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -4098,7 +4098,7 @@ static void hdd_deinit_station_mode(struct hdd_context *hdd_ctx,
 	}
 
 
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_deinit_adapter(struct hdd_context *hdd_ctx,
@@ -4129,7 +4129,7 @@ void hdd_deinit_adapter(struct hdd_context *hdd_ctx,
 		break;
 	}
 
-	EXIT();
+	hdd_exit();
 }
 
 static void hdd_cleanup_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *adapter,
@@ -4514,7 +4514,7 @@ int hdd_set_fw_params(struct hdd_adapter *adapter)
 	}
 
 	hdd_set_fw_log_params(hdd_ctx, adapter);
-	EXIT();
+	hdd_exit();
 
 	return 0;
 
@@ -4824,7 +4824,7 @@ QDF_STATUS hdd_close_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 		}
 	} while (QDF_IS_STATUS_SUCCESS(status));
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -5120,7 +5120,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 		adapter->scan_info.default_scan_ies = NULL;
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -5140,7 +5140,7 @@ void  hdd_deinit_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 	hdd_for_each_adapter(hdd_ctx, adapter)
 		hdd_deinit_adapter(hdd_ctx, adapter, rtnl_held);
 
-	EXIT();
+	hdd_exit();
 }
 
 QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
@@ -5154,7 +5154,7 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx)
 	hdd_for_each_adapter(hdd_ctx, adapter)
 		hdd_stop_adapter(hdd_ctx, adapter);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -5277,7 +5277,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 		hdd_vdev_destroy(adapter);
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -5912,7 +5912,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 		wlan_hdd_cfg80211_register_frames(adapter);
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -6200,7 +6200,7 @@ static inline QDF_STATUS hdd_unregister_wext_all_adapters(struct hdd_context *
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -6224,7 +6224,7 @@ QDF_STATUS hdd_abort_mac_scan_all_adapters(struct hdd_context *hdd_ctx)
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -6256,7 +6256,7 @@ static QDF_STATUS hdd_abort_sched_scan_all_adapters(struct hdd_context *hdd_ctx)
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -6682,14 +6682,14 @@ void __hdd_wlan_exit(void)
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
 		hdd_err("Invalid HDD Context");
-		EXIT();
+		hdd_exit();
 		return;
 	}
 
 	/* Do all the cleanup before deregistering the driver */
 	hdd_wlan_exit(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 }
 
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
@@ -7609,7 +7609,7 @@ static QDF_STATUS hdd_11d_scan_done(tHalHandle halHandle, void *pContext,
 
 	sme_scan_flush_result(halHandle);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -8459,7 +8459,7 @@ static void hdd_iface_change_callback(void *priv)
 	ret = hdd_wlan_stop_modules(hdd_ctx, false);
 	if (ret)
 		hdd_err("Failed to stop modules");
-	EXIT();
+	hdd_exit();
 }
 
 #ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
@@ -8564,7 +8564,7 @@ skip_multicast_logging:
 
 	cds_set_context(QDF_MODULE_ID_HDD, hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 
 	return hdd_ctx;
 
@@ -8696,7 +8696,7 @@ int hdd_start_station_adapter(struct hdd_adapter *adapter)
 		hdd_tx_resume_cb,
 		hdd_tx_flow_control_is_pause);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -8762,7 +8762,7 @@ int hdd_start_ap_adapter(struct hdd_adapter *adapter)
 		hdd_softap_tx_resume_cb,
 		hdd_tx_flow_control_is_pause);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9192,7 +9192,7 @@ static int hdd_pktlog_set_buff_size(struct hdd_context *hdd_ctx, int set_value2)
 	status = sme_wifi_start_logger(hdd_ctx->hHal, start_log);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_wifi_start_logger failed(err=%d)", status);
-		EXIT();
+		hdd_exit();
 		return -EINVAL;
 	}
 
@@ -9220,7 +9220,7 @@ static int hdd_pktlog_clear_buff(struct hdd_context *hdd_ctx)
 	status = sme_wifi_start_logger(hdd_ctx->hHal, start_log);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_wifi_start_logger failed(err=%d)", status);
-		EXIT();
+		hdd_exit();
 		return -EINVAL;
 	}
 
@@ -9322,7 +9322,7 @@ int hdd_pktlog_enable_disable(struct hdd_context *hdd_ctx, bool enable,
 	status = sme_wifi_start_logger(hdd_ctx->hHal, start_log);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		hdd_err("sme_wifi_start_logger failed(err=%d)", status);
-		EXIT();
+		hdd_exit();
 		return -EINVAL;
 	}
 
@@ -9946,7 +9946,7 @@ static int hdd_features_init(struct hdd_context *hdd_ctx, struct hdd_adapter *ad
 
 	wlan_hdd_init_chan_info(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 
 deregister_cb:
@@ -10180,7 +10180,7 @@ static int hdd_deconfigure_cds(struct hdd_context *hdd_ctx)
 		ret = -EINVAL;
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -10380,7 +10380,7 @@ done:
 	hdd_alert("stop WLAN module: exit driver status=%d",
 		  hdd_ctx->driver_status);
 
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -10684,7 +10684,7 @@ err_hdd_free_context:
 	return ret;
 
 success:
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -10764,7 +10764,7 @@ static void hdd_get_nud_stats_cb(void *data, struct rsp_stats *rsp)
 	complete(&context->response_event);
 	spin_unlock(&hdd_context_lock);
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -10846,7 +10846,7 @@ int hdd_register_cb(struct hdd_context *hdd_ctx)
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		hdd_err("Register tx queue callback failed");
 
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -10891,7 +10891,7 @@ void hdd_deregister_cb(struct hdd_context *hdd_ctx)
 	sme_deregister_oem_data_rsp_callback(hdd_ctx->hHal);
 	sme_deregister11d_scan_done_callback(hdd_ctx->hHal);
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -10918,7 +10918,7 @@ QDF_STATUS hdd_softap_sta_deauth(struct hdd_adapter *adapter,
 		wlansap_deauth_sta(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
 				   pDelStaParams);
 
-	EXIT();
+	hdd_exit();
 	return qdf_status;
 }
 
@@ -11323,7 +11323,7 @@ void hdd_bus_bw_compute_timer_start(struct hdd_context *hdd_ctx)
 
 	__hdd_bus_bw_compute_timer_start(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_bus_bw_compute_timer_try_start(struct hdd_context *hdd_ctx)
@@ -11338,7 +11338,7 @@ void hdd_bus_bw_compute_timer_try_start(struct hdd_context *hdd_ctx)
 	if (hdd_any_adapter_is_assoc(hdd_ctx))
 		__hdd_bus_bw_compute_timer_start(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 }
 
 static void __hdd_bus_bw_compute_timer_stop(struct hdd_context *hdd_ctx)
@@ -11364,7 +11364,7 @@ void hdd_bus_bw_compute_timer_stop(struct hdd_context *hdd_ctx)
 
 	__hdd_bus_bw_compute_timer_stop(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx)
@@ -11379,7 +11379,7 @@ void hdd_bus_bw_compute_timer_try_stop(struct hdd_context *hdd_ctx)
 	if (!hdd_any_adapter_is_assoc(hdd_ctx))
 		__hdd_bus_bw_compute_timer_stop(hdd_ctx);
 
-	EXIT();
+	hdd_exit();
 }
 #endif
 
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 9cb61a541c69..1cf428b96fe2 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -116,7 +116,7 @@ static int hdd_close_ndi(struct hdd_adapter *adapter)
 	/* We are good to close the adapter */
 	hdd_close_adapter(hdd_ctx, adapter, true);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -229,7 +229,7 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 	roam_profile->ChannelInfo.ChannelList = NULL;
 	roam_profile->ChannelInfo.numOfChannels = 0;
 
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -501,7 +501,7 @@ struct wlan_objmgr_vdev *hdd_ndi_open(char *iface_name)
 		return NULL;
 	}
 
-	EXIT();
+	hdd_exit();
 	return adapter->hdd_vdev;
 }
 
@@ -542,11 +542,11 @@ int hdd_ndi_start(uint8_t vdev_id)
 		hdd_err("NDI start bss failed");
 		/* Start BSS failed, delete the interface */
 		hdd_close_ndi(adapter);
-		EXIT();
+		hdd_exit();
 		return -EINVAL;
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -775,7 +775,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
 		wlan_hdd_netif_queue_control(adapter,
 				WLAN_WAKE_ALL_NETIF_QUEUE, WLAN_CONTROL_PATH);
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -827,5 +827,5 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id,
 		wlan_hdd_netif_queue_control(adapter, WLAN_STOP_ALL_NETIF_QUEUE,
 					     WLAN_CONTROL_PATH);
 	}
-	EXIT();
+	hdd_exit();
 }
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 3187332129c9..b35743efadee 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -163,7 +163,7 @@ int iw_get_oem_data_cap(struct net_device *dev,
 	pHddOemDataCap = (struct oem_data_cap *) (extra);
 	*pHddOemDataCap = oemDataCap;
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index d7d88838228c..b16a0e72b69b 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -746,7 +746,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	if (hdd_ctx->rps)
 		hdd_send_rps_ind(adapter);
 
-	EXIT();
+	hdd_exit();
 	return adapter->dev->ieee80211_ptr;
 
 stop_modules:
@@ -891,7 +891,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 		hdd_close_adapter(hdd_ctx, pVirtAdapter, true);
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 54ca0211c67c..7dcb8a8cb4cb 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -234,7 +234,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 	}
 
 exit:
-	EXIT();
+	hdd_exit();
 
 	return NOTIFY_DONE;
 }
@@ -426,7 +426,7 @@ void hdd_enable_ns_offload(struct hdd_adapter *adapter,
 out:
 	if (ns_req)
 		qdf_mem_free(ns_req);
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -449,7 +449,7 @@ void hdd_disable_ns_offload(struct hdd_adapter *adapter,
 		hdd_wlan_offload_event(SIR_IPV6_NS_OFFLOAD,
 			SIR_OFFLOAD_DISABLE);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -485,7 +485,7 @@ static void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
 	hdd_enable_ns_offload(adapter, pmo_ipv6_change_notify);
 
 exit:
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -511,7 +511,7 @@ static void hdd_enable_hw_filter(struct hdd_adapter *adapter)
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("Failed to enable hardware filter");
 
-	EXIT();
+	hdd_exit();
 }
 
 static void hdd_disable_hw_filter(struct hdd_adapter *adapter)
@@ -524,7 +524,7 @@ static void hdd_disable_hw_filter(struct hdd_adapter *adapter)
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("Failed to disable hardware filter");
 
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_enable_host_offloads(struct hdd_adapter *adapter,
@@ -550,7 +550,7 @@ void hdd_enable_host_offloads(struct hdd_adapter *adapter,
 	hdd_enable_mc_addr_filtering(adapter, trigger);
 	hdd_enable_hw_filter(adapter);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -577,7 +577,7 @@ void hdd_disable_host_offloads(struct hdd_adapter *adapter,
 	hdd_disable_mc_addr_filtering(adapter, trigger);
 	hdd_disable_hw_filter(adapter);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -760,7 +760,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 		sme_send_hlp_ie_info(hdd_ctx->hHal, adapter->session_id,
 				     roam_profile, ifa->ifa_local);
 exit:
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -836,7 +836,7 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
 	}
 
 exit:
-	EXIT();
+	hdd_exit();
 
 	return NOTIFY_DONE;
 }
@@ -937,7 +937,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
 out:
 	if (arp_req)
 		qdf_mem_free(arp_req);
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -961,7 +961,7 @@ void hdd_disable_arp_offload(struct hdd_adapter *adapter,
 	else
 		hdd_info("fail to disable arp offload");
 out:
-	EXIT();
+	hdd_exit();
 }
 
 void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
@@ -980,7 +980,7 @@ void hdd_enable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("failed to enable mc list status %d", status);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -1000,7 +1000,7 @@ void hdd_disable_mc_addr_filtering(struct hdd_adapter *adapter,
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("failed to disable mc list status %d", status);
 out:
-	EXIT();
+	hdd_exit();
 
 }
 
@@ -1016,7 +1016,7 @@ int hdd_cache_mc_addr_list(struct pmo_mc_addr_list_params *mc_list_config)
 		hdd_info("fail to cache mc list status %d", status);
 		ret = -EINVAL;
 	}
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -1039,7 +1039,7 @@ void hdd_disable_and_flush_mc_addr_list(struct hdd_adapter *adapter,
 	status = pmo_ucfg_flush_mc_addr_list(psoc, adapter->session_id);
 	if (status != QDF_STATUS_SUCCESS)
 		hdd_info("fail to flush mc list status %d", status);
-	EXIT();
+	hdd_exit();
 
 	return;
 
@@ -1223,7 +1223,7 @@ static void hdd_ssr_restart_sap(struct hdd_context *hdd_ctx)
 		}
 	}
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -1606,7 +1606,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	exit_code = 0;
 
 exit_with_code:
-	EXIT();
+	hdd_exit();
 	return exit_code;
 }
 
@@ -1792,7 +1792,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 
 	pld_request_bus_bandwidth(hdd_ctx->parent_dev, PLD_BUS_WIDTH_NONE);
 
-	EXIT();
+	hdd_exit();
 	return 0;
 
 #ifdef QCA_CONFIG_SMP
@@ -1932,7 +1932,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 	allow_power_save ? hdd_stop_dhcp_ind(adapter) :
 		hdd_start_dhcp_ind(adapter);
 
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -2027,7 +2027,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 		return -EIO;
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -2117,7 +2117,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 	wlan_hdd_get_class_astats(adapter);
 	*dbm = adapter->hdd_stats.class_a_stat.max_pwr;
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
diff --git a/core/hdd/src/wlan_hdd_regulatory.c b/core/hdd/src/wlan_hdd_regulatory.c
index e618f969e632..08ef1cd711c2 100644
--- a/core/hdd/src/wlan_hdd_regulatory.c
+++ b/core/hdd/src/wlan_hdd_regulatory.c
@@ -657,7 +657,7 @@ void hdd_update_indoor_channel(struct hdd_context *hdd_ctx,
 		disable))) {
 		hdd_err("Failed to notify sap event");
 	}
-	EXIT();
+	hdd_exit();
 
 }
 
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 42cb01edecf9..a515e32c445c 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -638,7 +638,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	status = wlan_cfg80211_scan(hdd_ctx->hdd_pdev, request, &params);
 	if (params.default_ie.ptr)
 		qdf_mem_free(params.default_ie.ptr);
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
@@ -1371,7 +1371,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct net_device *dev)
 
 	err = wlan_hdd_sched_scan_stop(dev);
 
-	EXIT();
+	hdd_exit();
 	return err;
 }
 
@@ -1440,7 +1440,7 @@ static void __wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
 
 	wlan_cfg80211_abort_scan(hdd_ctx->hdd_pdev);
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 98a788a4f85c..64125258ad0e 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -1106,7 +1106,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
 		p2p_peer_authorized(adapter->hdd_vdev, pDestMacAddress->bytes);
 	}
 
-	EXIT();
+	hdd_exit();
 	return qdf_status;
 }
 
diff --git a/core/hdd/src/wlan_hdd_spectralscan.c b/core/hdd/src/wlan_hdd_spectralscan.c
index f51c02e5a9aa..8f0d30eb91d5 100644
--- a/core/hdd/src/wlan_hdd_spectralscan.c
+++ b/core/hdd/src/wlan_hdd_spectralscan.c
@@ -69,7 +69,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
 	ret = wlan_cfg80211_spectral_scan_config_and_start(wiphy,
 					hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -106,7 +106,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_stop(struct wiphy *wiphy,
 
 	ret = wlan_cfg80211_spectral_scan_stop(wiphy, hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -144,7 +144,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_config(
 
 	ret = wlan_cfg80211_spectral_scan_get_config(wiphy, hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -183,7 +183,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_diag_stats(
 	ret = wlan_cfg80211_spectral_scan_get_diag_stats(wiphy,
 					hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -221,7 +221,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_cap_info(
 
 	ret = wlan_cfg80211_spectral_scan_get_cap(wiphy, hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
@@ -260,7 +260,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_get_status(
 
 	ret = wlan_cfg80211_spectral_scan_get_status(wiphy, hdd_ctx->hdd_pdev,
 					data, data_len);
-	EXIT();
+	hdd_exit();
 
 	return ret;
 }
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 99b1a0ac0a6e..4267ed904f4a 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -654,7 +654,7 @@ static void hdd_link_layer_process_peer_stats(struct hdd_adapter *adapter,
 	}
 
 	cfg80211_vendor_cmd_reply(vendor_event);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -717,7 +717,7 @@ static void hdd_link_layer_process_iface_stats(struct hdd_adapter *adapter,
 	}
 
 	cfg80211_vendor_cmd_reply(vendor_event);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -955,7 +955,7 @@ static void hdd_link_layer_process_radio_stats(struct hdd_adapter *adapter,
 		pWifiRadioStat++;
 	}
 
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -1261,7 +1261,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 	}
 
 	adapter->is_link_layer_stats_set = true;
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -1374,7 +1374,7 @@ int wlan_hdd_ll_stats_get(struct hdd_adapter *adapter, uint32_t req_id,
 		hdd_err("Send LL stats req failed, id:%u, mask:%d, session:%d",
 			req_id, req_mask, adapter->session_id);
 
-	EXIT();
+	hdd_exit();
 	return ret;
 
 }
@@ -1463,7 +1463,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 		return ret;
 	}
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -1610,7 +1610,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 
 			return cfg80211_vendor_cmd_reply(temp_skbuff);
 		}
-		EXIT();
+		hdd_exit();
 		return -ENOMEM;
 	}
 
@@ -2291,7 +2291,7 @@ void wlan_hdd_cfg80211_link_layer_stats_ext_callback(tHddHandle ctx,
 		cfg80211_vendor_event(skb, GFP_KERNEL);
 	else
 		kfree_skb(skb);
-	EXIT();
+	hdd_exit();
 }
 
 static const struct nla_policy
@@ -4402,7 +4402,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 			 TRACE_CODE_HDD_CFG80211_GET_STA,
 			 adapter->session_id, maxRate));
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -4660,7 +4660,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy,
 
 	if (!filled)
 		return -ENONET;
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4943,7 +4943,7 @@ out:
 	qdf_mem_free(rcpi_req);
 	hdd_request_put(request);
 
-	EXIT();
+	hdd_exit();
 	return status;
 }
 
diff --git a/core/hdd/src/wlan_hdd_subnet_detect.c b/core/hdd/src/wlan_hdd_subnet_detect.c
index 08f9d10453fe..29f149b9417f 100644
--- a/core/hdd/src/wlan_hdd_subnet_detect.c
+++ b/core/hdd/src/wlan_hdd_subnet_detect.c
@@ -163,7 +163,7 @@ static int __wlan_hdd_cfg80211_set_gateway_params(struct wiphy *wiphy,
 		ret = -EINVAL;
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index 42d5e04ee4e9..99c482c605a5 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -675,11 +675,11 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 	if (hdd_ctx->tdls_umac_comp_active) {
 		status = wlan_cfg80211_tdls_oper(hdd_ctx->hdd_pdev,
 						 dev, peer, oper);
-		EXIT();
+		hdd_exit();
 		return status;
 	}
 
-	EXIT();
+	hdd_exit();
 	return -EINVAL;
 }
 
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index f675c6405383..78c8e9e4c593 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -3726,7 +3726,7 @@ QDF_STATUS wlan_hdd_get_snr(struct hdd_adapter *adapter, int8_t *snr)
 	hdd_request_put(request);
 
 	*snr = adapter->snr;
-	EXIT();
+	hdd_exit();
 	return QDF_STATUS_SUCCESS;
 }
 
@@ -4141,7 +4141,7 @@ void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	qdf_zero_macaddr(&sta_ctx->requested_bssid);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -4541,7 +4541,7 @@ static int __iw_get_name(struct net_device *dev,
 		return ret;
 
 	strlcpy(wrqu, "Qcom:802.11n", IFNAMSIZ);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4717,7 +4717,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info,
 		IW_SCAN_CAPA_ESSID | IW_SCAN_CAPA_TYPE | IW_SCAN_CAPA_CHANNEL;
 #endif
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -4778,7 +4778,7 @@ static void hdd_get_class_a_statistics_cb(void *stats, void *context)
 	priv->class_a_stats = *returned_stats;
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -5015,7 +5015,7 @@ static int __iw_get_linkspeed(struct net_device *dev,
 		return -EIO;
 	}
 
-	EXIT();
+	hdd_exit();
 	/* a value is being successfully returned */
 	return 0;
 }
@@ -5403,7 +5403,7 @@ static void hdd_get_temperature_cb(int temperature, void *context)
 	priv->temperature = temperature;
 	hdd_request_complete(request);
 	hdd_request_put(request);
-	EXIT();
+	hdd_exit();
 }
 
 /**
@@ -5463,7 +5463,7 @@ int wlan_hdd_get_temperature(struct hdd_adapter *adapter, int *temperature)
 	hdd_request_put(request);
 
 	*temperature = adapter->temperature;
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -6736,7 +6736,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 		ret = -EINVAL;
 		break;
 	}
-	EXIT();
+	hdd_exit();
 free:
 	qdf_mem_free(sme_config);
 	return ret;
@@ -6949,7 +6949,7 @@ static int __iw_setchar_getnone(struct net_device *dev,
 	}
 	}
 	qdf_mem_free(pBuffer);
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -7477,7 +7477,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 		break;
 	}
 	}
-	EXIT();
+	hdd_exit();
 	qdf_mem_free(sme_config);
 	return ret;
 }
@@ -7620,7 +7620,7 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
 		break;
 
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -8252,7 +8252,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 	}
 	}
 
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -8388,7 +8388,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
 		break;
 	}
 	}
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -8864,7 +8864,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 	}
 	break;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9102,7 +9102,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	*pStatus = hdd_wmm_addts(adapter, handle, &tSpec);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9169,7 +9169,7 @@ static int __iw_del_tspec(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	*pStatus = hdd_wmm_delts(adapter, handle);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9229,7 +9229,7 @@ static int __iw_get_tspec(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	*pStatus = hdd_wmm_checkts(adapter, handle);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9297,7 +9297,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info,
 	/* Pass the received FT IEs to SME */
 	sme_set_ft_ies(WLAN_HDD_GET_HAL_CTX(adapter), adapter->session_id,
 			extra, wrqu->data.length);
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9438,7 +9438,7 @@ static int __iw_set_host_offload(struct net_device *dev,
 		hdd_err("Failure to execute host offload request");
 		return -EINVAL;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9529,7 +9529,7 @@ static int __iw_set_keepalive_params(struct net_device *dev,
 		hdd_err("Failure to execute Keep Alive");
 		return -EINVAL;
 	}
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
@@ -9791,7 +9791,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev,
 	ret = wlan_hdd_set_filter(hdd_ctx, request, adapter->session_id);
 
 	qdf_mem_free(request);
-	EXIT();
+	hdd_exit();
 	return ret;
 }
 
@@ -10031,7 +10031,7 @@ return_cached_stats:
 
 	wrqu->data.length = tlen;
 
-	EXIT();
+	hdd_exit();
 
 	return 0;
 }
@@ -12120,7 +12120,7 @@ static int hdd_set_wext(struct hdd_adapter *adapter)
 
 	hdd_clear_roam_profile_ie(adapter);
 
-	EXIT();
+	hdd_exit();
 	return QDF_STATUS_SUCCESS;
 
 }
@@ -12172,7 +12172,7 @@ int hdd_register_wext(struct net_device *dev)
 	/* Register as a wireless device */
 	dev->wireless_handlers = (struct iw_handler_def *)&we_handler_def;
 
-	EXIT();
+	hdd_exit();
 	return 0;
 }
 
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index 498cc2412866..d7566bcf5026 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -1890,7 +1890,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		hdd_wmm_init(adapter);
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -1981,7 +1981,7 @@ QDF_STATUS hdd_wmm_connect(struct hdd_adapter *adapter,
 
 	}
 
-	EXIT();
+	hdd_exit();
 
 	return QDF_STATUS_SUCCESS;
 }