diff --git a/cfg/inc/i_cfg.h b/cfg/inc/i_cfg.h
index ba2460ff89..92a7088e35 100644
--- a/cfg/inc/i_cfg.h
+++ b/cfg/inc/i_cfg.h
@@ -28,13 +28,11 @@
 #include "qdf_types.h"
 #include "wlan_objmgr_psoc_obj.h"
 
-#define __cfg_log(level, fmt, args...) \
-	QDF_TRACE(QDF_MODULE_ID_CONFIG, level, FL(fmt), ##args)
-#define cfg_err(fmt, args...) __cfg_log(QDF_TRACE_LEVEL_ERROR, fmt, ##args)
-#define cfg_info(fmt, args...) __cfg_log(QDF_TRACE_LEVEL_INFO, fmt, ##args)
-#define cfg_debug(fmt, args...) __cfg_log(QDF_TRACE_LEVEL_DEBUG, fmt, ##args)
-#define cfg_enter() cfg_debug("enter")
-#define cfg_exit() cfg_debug("exit")
+#define cfg_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_CONFIG, params)
+#define cfg_info(params...) QDF_TRACE_INFO(QDF_MODULE_ID_CONFIG, params)
+#define cfg_debug(params...) QDF_TRACE_DEBUG(QDF_MODULE_ID_CONFIG, params)
+#define cfg_enter() QDF_TRACE_ENTER(QDF_MODULE_ID_CONFIG, "enter")
+#define cfg_exit() QDF_TRACE_EXIT(QDF_MODULE_ID_CONFIG, "exit")
 
 /* define global config values structure */
 
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index 99ae039a20..334f1dd76d 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -152,6 +152,20 @@ static inline void __qdf_trace_noop(QDF_MODULE_ID module, char *format, ...) { }
 #define QDF_TRACE_DEBUG_RL(params...) __qdf_trace_noop(params)
 #endif
 
+#ifdef WLAN_LOG_ENTER
+#define QDF_TRACE_ENTER(params...) \
+	__QDF_TRACE_FL(QDF_TRACE_LEVEL_DEBUG, ## params)
+#else
+#define QDF_TRACE_ENTER(params...) __qdf_trace_noop(params)
+#endif
+
+#ifdef WLAN_LOG_EXIT
+#define QDF_TRACE_EXIT(params...) \
+	__QDF_TRACE_FL(QDF_TRACE_LEVEL_DEBUG, ## params)
+#else
+#define QDF_TRACE_EXIT(params...) __qdf_trace_noop(params)
+#endif
+
 #define QDF_ENABLE_TRACING
 #define qdf_scnprintf scnprintf
 
diff --git a/target_if/core/inc/target_if.h b/target_if/core/inc/target_if.h
index ae27cb8986..c852c9d0e1 100644
--- a/target_if/core/inc/target_if.h
+++ b/target_if/core/inc/target_if.h
@@ -43,9 +43,10 @@
 	QDF_TRACE_INFO(QDF_MODULE_ID_TARGET_IF, params)
 #define target_if_debug(params...) \
 	QDF_TRACE_DEBUG(QDF_MODULE_ID_TARGET_IF, params)
-
-#define TARGET_IF_ENTER() target_if_debug("enter")
-#define TARGET_IF_EXIT() target_if_debug("exit")
+#define TARGET_IF_ENTER() \
+	QDF_TRACE_ENTER(QDF_MODULE_ID_TARGET_IF, "enter")
+#define TARGET_IF_EXIT() \
+	QDF_TRACE_EXIT(QDF_MODULE_ID_TARGET_IF, "exit")
 
 #ifdef CONFIG_MCL
 #define TARGET_TYPE_AR900B    9  /* Beeliner */
diff --git a/target_if/direct_buf_rx/inc/target_if_direct_buf_rx_api.h b/target_if/direct_buf_rx/inc/target_if_direct_buf_rx_api.h
index 5f947d91cf..8bca0d5e5b 100644
--- a/target_if/direct_buf_rx/inc/target_if_direct_buf_rx_api.h
+++ b/target_if/direct_buf_rx/inc/target_if_direct_buf_rx_api.h
@@ -35,9 +35,9 @@
 #define direct_buf_rx_debug(params...) \
 	QDF_TRACE_DEBUG(QDF_MODULE_ID_DIRECT_BUF_RX, params)
 #define direct_buf_rx_enter() \
-	direct_buf_rx_debug("enter")
+	QDF_TRACE_ENTER(QDF_MODULE_ID_DIRECT_BUF_RX, "enter")
 #define direct_buf_rx_exit() \
-	direct_buf_rx_debug("exit")
+	QDF_TRACE_EXIT(QDF_MODULE_ID_DIRECT_BUF_RX, "exit")
 
 #define DBR_MAX_CHAINS      (8)
 
diff --git a/umac/cmn_services/serialization/src/wlan_serialization_main_i.h b/umac/cmn_services/serialization/src/wlan_serialization_main_i.h
index dd732cf49a..4ba7d5d043 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_main_i.h
+++ b/umac/cmn_services/serialization/src/wlan_serialization_main_i.h
@@ -42,9 +42,10 @@
 	QDF_TRACE_INFO(QDF_MODULE_ID_SERIALIZATION, params)
 #define serialization_debug(params...) \
 	QDF_TRACE_DEBUG(QDF_MODULE_ID_SERIALIZATION, params)
-
-#define serialization_enter() serialization_debug("enter")
-#define serialization_exit() serialization_debug("exit")
+#define serialization_enter() \
+	QDF_TRACE_ENTER(QDF_MODULE_ID_SERIALIZATION, "enter")
+#define serialization_exit() \
+	QDF_TRACE_EXIT(QDF_MODULE_ID_SERIALIZATION, "exit")
 
 /**
  * struct serialization_legacy_callback - to handle legacy serialization cb