diff --git a/ftm/dispatcher/inc/wlan_ftm_ucfg_api.h b/ftm/dispatcher/inc/wlan_ftm_ucfg_api.h
index 34a6489c6d..ee2d158a0d 100644
--- a/ftm/dispatcher/inc/wlan_ftm_ucfg_api.h
+++ b/ftm/dispatcher/inc/wlan_ftm_ucfg_api.h
@@ -30,21 +30,16 @@
 #define FTM_DEBUG       0
 
 #if FTM_DEBUG
-#define ftm_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_FTM, level, ## args)
-#define ftm_logfl(level, format, args...) \
-	ftm_log(level, FL(format), ## args)
-
-#define ftm_alert(format, args...) \
-	ftm_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define ftm_err(format, args...) \
-	ftm_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define ftm_warn(format, args...) \
-	ftm_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define ftm_notice(format, args...) \
-	ftm_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define ftm_debug(format, args...) \
-	ftm_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define ftm_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_FTM, params)
+#define ftm_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_FTM, params)
+#define ftm_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_FTM, params)
+#define ftm_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_FTM, params)
+#define ftm_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_FTM, params)
 #else
 #define ftm_alert(format, args...)
 #define ftm_err(format, args...)
diff --git a/os_if/linux/wlan_cfg80211.h b/os_if/linux/wlan_cfg80211.h
index 241fb0e4f0..56d121f281 100644
--- a/os_if/linux/wlan_cfg80211.h
+++ b/os_if/linux/wlan_cfg80211.h
@@ -30,23 +30,18 @@
 #include <net/cfg80211.h>
 #include <qca_vendor.h>
 
-#define cfg80211_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_OS_IF, level, ## args)
-#define cfg80211_logfl(level, format, args...) \
-	cfg80211_log(level, FL(format), ## args)
-
-#define cfg80211_alert(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define cfg80211_err(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define cfg80211_warn(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define cfg80211_notice(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define cfg80211_info(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define cfg80211_debug(format, args...) \
-	cfg80211_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define cfg80211_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_OS_IF, params)
+#define cfg80211_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_OS_IF, params)
+#define cfg80211_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_OS_IF, params)
+#define cfg80211_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_OS_IF, params)
+#define cfg80211_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_OS_IF, params)
+#define cfg80211_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_OS_IF, params)
 
 #define COMMON_VENDOR_COMMANDS						\
 { 									\
diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h
index a7bf1f26dc..1f99743df8 100644
--- a/qdf/inc/qdf_types.h
+++ b/qdf/inc/qdf_types.h
@@ -596,9 +596,7 @@ void qdf_vtrace_msg(QDF_MODULE_ID module, QDF_TRACE_LEVEL level,
 		    char *str_format, va_list val);
 
 #ifdef CONFIG_MCL
-#define qdf_print(args...) \
-	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
-
+#define qdf_print(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_QDF, ## params)
 #define qdf_alert(params...) QDF_TRACE_FATAL(QDF_MODULE_ID_QDF, ## params)
 #define qdf_err(params...) QDF_TRACE_ERROR(QDF_MODULE_ID_QDF, ## params)
 #define qdf_warn(params...) QDF_TRACE_WARN(QDF_MODULE_ID_QDF, ## params)
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index f27e9fdba5..0c71acfcf3 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -91,6 +91,7 @@
 
 #define QDF_VTRACE qdf_vtrace_msg
 #define QDF_TRACE_HEX_DUMP qdf_trace_hex_dump
+#define __QDF_TRACE_RATE_LIMITED(arg ...)
 #endif /* CONFIG_MCL */
 
 #define __QDF_TRACE_FL(log_level, module_id, format, args...) \
diff --git a/scheduler/inc/scheduler_core.h b/scheduler/inc/scheduler_core.h
index cc273003c4..e302015bf4 100644
--- a/scheduler/inc/scheduler_core.h
+++ b/scheduler/inc/scheduler_core.h
@@ -34,19 +34,16 @@
 #define SCHEDULER_WRAPPER_MAX_FAIL_COUNT (SCHEDULER_CORE_MAX_MESSAGES * 3)
 #define SCHEDULER_WATCHDOG_TIMEOUT (10 * 1000) /* 10s */
 
-#define __sched_log(level, format, args...) \
-	QDF_TRACE(QDF_MODULE_ID_SCHEDULER, level, FL(format), ## args)
-
-#define sched_fatal(format, args...) \
-	__sched_log(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define sched_err(format, args...) \
-	__sched_log(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define sched_warn(format, args...) \
-	__sched_log(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define sched_info(format, args...) \
-	__sched_log(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define sched_debug(format, args...) \
-	__sched_log(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define sched_fatal(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_SCHEDULER, params)
+#define sched_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_SCHEDULER, params)
+#define sched_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_SCHEDULER, params)
+#define sched_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_SCHEDULER, params)
+#define sched_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_SCHEDULER, params)
 
 #define sched_enter() sched_debug("Enter")
 #define sched_exit() sched_debug("Exit")
diff --git a/target_if/core/inc/target_if.h b/target_if/core/inc/target_if.h
index 430dacd69e..7232d2939b 100644
--- a/target_if/core/inc/target_if.h
+++ b/target_if/core/inc/target_if.h
@@ -33,25 +33,19 @@
 /* ASCII "TGT\0" */
 #define TGT_MAGIC 0x54575400
 
-#define target_if_log(level, args...) \
-		QDF_TRACE(QDF_MODULE_ID_TARGET_IF, level, ## args)
-#define target_if_logfl(level, format, args...) \
-		target_if_log(level, FL(format), ## args)
-
-#define target_if_fatal(format, args...) \
-		target_if_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define target_if_err(format, args...) \
-		target_if_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define target_if_warn(format, args...) \
-		target_if_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define target_if_info(format, args...) \
-		target_if_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define target_if_debug(format, args...) \
-		target_if_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-
-#define TARGET_IF_ENTER() target_if_logfl(QDF_TRACE_LEVEL_DEBUG, "enter")
-#define TARGET_IF_EXIT() target_if_logfl(QDF_TRACE_LEVEL_DEBUG, "exit")
+#define target_if_fatal(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_TARGET_IF, params)
+#define target_if_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_TARGET_IF, params)
+#define target_if_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_TARGET_IF, params)
+#define target_if_info(params...) \
+	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")
 
 #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 f13888a177..5f947d91cf 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
@@ -22,26 +22,22 @@
 #include "qdf_nbuf.h"
 #include "qdf_atomic.h"
 
-#define direct_buf_rx_log(level, args...) \
-		QDF_TRACE(QDF_MODULE_ID_DIRECT_BUF_RX, level, ## args)
-#define direct_buf_rx_logfl(level, format, args...) \
-		direct_buf_rx_log(level, FL(format), ## args)
-#define direct_buf_alert(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define direct_buf_rx_err(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define direct_buf_rx_warn(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define direct_buf_rx_notice(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define direct_buf_rx_info(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define direct_buf_rx_debug(format, args...) \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define direct_buf_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_DIRECT_BUF_RX, params)
+#define direct_buf_rx_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_DIRECT_BUF_RX, params)
+#define direct_buf_rx_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_DIRECT_BUF_RX, params)
+#define direct_buf_rx_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_DIRECT_BUF_RX, params)
+#define direct_buf_rx_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_DIRECT_BUF_RX, params)
+#define direct_buf_rx_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_DIRECT_BUF_RX, params)
 #define direct_buf_rx_enter() \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_DEBUG, "enter")
+	direct_buf_rx_debug("enter")
 #define direct_buf_rx_exit() \
-		direct_buf_rx_logfl(QDF_TRACE_LEVEL_DEBUG, "exit")
+	direct_buf_rx_debug("exit")
 
 #define DBR_MAX_CHAINS      (8)
 
diff --git a/umac/cmn_services/mgmt_txrx/dispatcher/inc/wlan_mgmt_txrx_utils_api.h b/umac/cmn_services/mgmt_txrx/dispatcher/inc/wlan_mgmt_txrx_utils_api.h
index 0d403b7c3c..42af0d18b4 100644
--- a/umac/cmn_services/mgmt_txrx/dispatcher/inc/wlan_mgmt_txrx_utils_api.h
+++ b/umac/cmn_services/mgmt_txrx/dispatcher/inc/wlan_mgmt_txrx_utils_api.h
@@ -36,24 +36,18 @@
 #define MGMT_DESC_POOL_MAX 512
 #endif
 
-#define mgmt_txrx_log(level, args...) \
-			QDF_TRACE(QDF_MODULE_ID_MGMT_TXRX, level, ## args)
-#define mgmt_txrx_logfl(level, format, args...) \
-			mgmt_txrx_log(level, FL(format), ## args)
-
-#define mgmt_txrx_alert(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define mgmt_txrx_err(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define mgmt_txrx_warn(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define mgmt_txrx_notice(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define mgmt_txrx_info(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define mgmt_txrx_debug(format, args...) \
-		mgmt_txrx_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-
+#define mgmt_txrx_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_MGMT_TXRX, params)
+#define mgmt_txrx_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_MGMT_TXRX, params)
+#define mgmt_txrx_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_MGMT_TXRX, params)
+#define mgmt_txrx_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_MGMT_TXRX, params)
+#define mgmt_txrx_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_MGMT_TXRX, params)
+#define mgmt_txrx_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_MGMT_TXRX, params)
 
 /**
  * enum mgmt_subtype - enum of mgmt. subtypes
diff --git a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
index a165a49ae8..68a086445c 100644
--- a/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
+++ b/umac/cmn_services/obj_mgr/inc/wlan_objmgr_cmn.h
@@ -40,28 +40,22 @@
 
 #define obj_mgr_log(level, args...) \
 		QDF_TRACE(QDF_MODULE_ID_OBJ_MGR, level, ## args)
-
 #define obj_mgr_logfl(level, format, args...) \
 		obj_mgr_log(level, FL(format), ## args)
-
-#define obj_mgr_alert(format, args...) \
-		obj_mgr_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-
-#define obj_mgr_err(format, args...) \
-		obj_mgr_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-
-#define obj_mgr_warn(format, args...) \
-		obj_mgr_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-
-#define obj_mgr_info(format, args...) \
-		obj_mgr_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-
-#define obj_mgr_debug(format, args...) \
-		obj_mgr_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-
 #define obj_mgr_log_level(level, format, args...)\
 		obj_mgr_logfl(level, format, ## args)
 
+#define obj_mgr_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_OBJ_MGR, params)
+#define obj_mgr_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_OBJ_MGR, params)
+#define obj_mgr_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_OBJ_MGR, params)
+#define obj_mgr_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_OBJ_MGR, params)
+#define obj_mgr_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_OBJ_MGR, params)
+
 /**
  * enum WLAN_OBJ_STATE - State of Object
  * @WLAN_OBJ_STATE_ALLOCATED:           Common object is allocated, but not
diff --git a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
index 0d7655ec32..787c9fe166 100644
--- a/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
+++ b/umac/cmn_services/policy_mgr/src/wlan_policy_mgr_i.h
@@ -153,23 +153,18 @@
 
 #define POLICY_MGR_DEFAULT_HW_MODE_INDEX 0xFFFF
 
-#define policy_mgr_log(level, args...) \
-		QDF_TRACE(QDF_MODULE_ID_POLICY_MGR, level, ## args)
-#define policy_mgr_logfl(level, format, args...) \
-		policy_mgr_log(level, FL(format), ## args)
-
-#define policy_mgr_alert(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define policy_mgr_err(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define policy_mgr_warn(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define policy_mgr_notice(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define policy_mgr_info(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define policy_mgr_debug(format, args...) \
-		policy_mgr_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define policy_mgr_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_POLICY_MGR, params)
+#define policy_mgr_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_POLICY_MGR, params)
+#define policy_mgr_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_POLICY_MGR, params)
+#define policy_mgr_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_POLICY_MGR, params)
+#define policy_mgr_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_POLICY_MGR, params)
+#define policy_mgr_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_POLICY_MGR, params)
 
 #define PM_CONC_CONNECTION_LIST_VALID_INDEX(index) \
 		((MAX_NUMBER_OF_CONC_CONNECTIONS > index) && \
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 5a375acda0..dd732cf49a 100644
--- a/umac/cmn_services/serialization/src/wlan_serialization_main_i.h
+++ b/umac/cmn_services/serialization/src/wlan_serialization_main_i.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -32,24 +32,19 @@
 #define WLAN_SERIALIZATION_MAX_ACTIVE_CMDS 1
 #define WLAN_SERIALIZATION_MAX_ACTIVE_SCAN_CMDS 8
 
-#define serialization_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_SERIALIZATION, level, ## args)
-#define serialization_logfl(level, format, args...) \
-	serialization_log(level, FL(format), ## args)
+#define serialization_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_SERIALIZATION, params)
+#define serialization_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_SERIALIZATION, params)
+#define serialization_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_SERIALIZATION, params)
+#define serialization_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_SERIALIZATION, params)
+#define serialization_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_SERIALIZATION, params)
 
-#define serialization_alert(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define serialization_err(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define serialization_warn(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define serialization_info(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define serialization_debug(format, args...) \
-	serialization_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-#define serialization_enter() \
-	serialization_logfl(QDF_TRACE_LEVEL_DEBUG, "enter")
-#define serialization_exit() serialization_logfl(QDF_TRACE_LEVEL_DEBUG, "exit")
+#define serialization_enter() serialization_debug("enter")
+#define serialization_exit() serialization_debug("exit")
 
 /**
  * struct serialization_legacy_callback - to handle legacy serialization cb
diff --git a/umac/green_ap/core/src/wlan_green_ap_main_i.h b/umac/green_ap/core/src/wlan_green_ap_main_i.h
index 9a98cecb11..490766f2f0 100644
--- a/umac/green_ap/core/src/wlan_green_ap_main_i.h
+++ b/umac/green_ap/core/src/wlan_green_ap_main_i.h
@@ -36,23 +36,18 @@
 #define WLAN_GREEN_AP_PS_ON_TIME        (0)
 #define WLAN_GREEN_AP_PS_TRANS_TIME     (20)
 
-#define green_ap_log(level, args...) \
-			QDF_TRACE(QDF_MODULE_ID_GREEN_AP, level, ## args)
-#define green_ap_logfl(level, format, args...) \
-			green_ap_log(level, FL(format), ## args)
-
-#define green_ap_alert(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define green_ap_err(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define green_apwarn(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define green_ap_notice(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define green_ap_info(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define green_ap_debug(format, args...) \
-		green_ap_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define green_ap_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_GREEN_AP, params)
+#define green_ap_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_GREEN_AP, params)
+#define green_ap_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_GREEN_AP, params)
+#define green_ap_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_GREEN_AP, params)
+#define green_ap_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_GREEN_AP, params)
+#define green_ap_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_GREEN_AP, params)
 
 #define WLAN_GREEN_AP_PS_DISABLE 0
 #define WLAN_GREEN_AP_PS_ENABLE 1
diff --git a/umac/nan/core/src/nan_main_i.h b/umac/nan/core/src/nan_main_i.h
index 7d2d770ce3..be7ab2b611 100644
--- a/umac/nan/core/src/nan_main_i.h
+++ b/umac/nan/core/src/nan_main_i.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -33,23 +33,18 @@ struct wlan_objmgr_vdev;
 struct wlan_objmgr_psoc;
 struct scheduler_msg;
 
-#define nan_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_NAN, level, ## args)
-#define nan_logfl(level, format, args...) \
-	nan_log(level, FL(format), ## args)
-
-#define nan_alert(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define nan_err(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define nan_warn(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define nan_notice(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define nan_info(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define nan_debug(format, args...) \
-	nan_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define nan_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_NAN, params)
+#define nan_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_NAN, params)
+#define nan_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_NAN, params)
+#define nan_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_NAN, params)
+#define nan_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_NAN, params)
+#define nan_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_NAN, params)
 
 #ifndef MAX_PEERS
 #define MAX_PEERS 32
diff --git a/umac/p2p/core/src/wlan_p2p_main.h b/umac/p2p/core/src/wlan_p2p_main.h
index 2e2beecd67..8cae740858 100644
--- a/umac/p2p/core/src/wlan_p2p_main.h
+++ b/umac/p2p/core/src/wlan_p2p_main.h
@@ -35,21 +35,16 @@
 #define P2P_MODULE_NAME  "P2P"
 #define P2P_INVALID_VDEV_ID 0xFFFFFFFF
 
-#define p2p_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_P2P, level, ## args)
-#define p2p_logl(level, format, args...) \
-	p2p_log(level, FL(format), ## args)
-
-#define p2p_debug(format, args ...) \
-	p2p_logl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-#define p2p_info(format, args ...) \
-	p2p_logl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define p2p_warn(format, args ...) \
-	p2p_logl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define p2p_err(format, args ...) \
-	p2p_logl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define p2p_alert(format, args ...) \
-	p2p_logl(QDF_TRACE_LEVEL_FATAL, format, ## args)
+#define p2p_debug(params ...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_P2P, params)
+#define p2p_info(params ...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_P2P, params)
+#define p2p_warn(params ...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_P2P, params)
+#define p2p_err(params ...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_P2P, params)
+#define p2p_alert(params ...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_P2P, params)
 
 struct scheduler_msg;
 struct p2p_tx_cnf;
diff --git a/umac/regulatory/core/src/reg_priv.h b/umac/regulatory/core/src/reg_priv.h
index bffd6dd5d4..b8e5d37ede 100644
--- a/umac/regulatory/core/src/reg_priv.h
+++ b/umac/regulatory/core/src/reg_priv.h
@@ -28,22 +28,18 @@
 #include "reg_db.h"
 #include "reg_services.h"
 
-#define reg_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_REGULATORY, level, ## args)
-#define reg_logfl(level, format, args...) reg_log(level, FL(format), ## args)
-
-#define reg_alert(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define reg_err(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define reg_warn(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define reg_notice(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define reg_info(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define reg_debug(format, args...) \
-		reg_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define reg_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_REGULATORY, params)
+#define reg_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_REGULATORY, params)
+#define reg_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_REGULATORY, params)
+#define reg_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_REGULATORY, params)
+#define reg_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_REGULATORY, params)
+#define reg_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_REGULATORY, params)
 
 struct wlan_regulatory_psoc_priv_obj {
 	struct mas_chan_params mas_chan_params[PSOC_MAX_PHY_REG_CAP];
diff --git a/umac/scan/core/src/wlan_scan_main.h b/umac/scan/core/src/wlan_scan_main.h
index 2da8cdad83..b53799ba2d 100644
--- a/umac/scan/core/src/wlan_scan_main.h
+++ b/umac/scan/core/src/wlan_scan_main.h
@@ -31,22 +31,18 @@
 #include "wlan_scan_cache_db.h"
 #include "wlan_scan_11d.h"
 
-#define scm_log(level, args...) \
-		QDF_TRACE(QDF_MODULE_ID_SCAN, level, ## args)
-#define scm_logfl(level, format, args...) \
-		scm_log(level, FL(format), ## args)
-#define scm_alert(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define scm_err(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define scm_warn(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define scm_notice(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define scm_info(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
-#define scm_debug(format, args...) \
-		scm_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define scm_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_SCAN, params)
+#define scm_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_SCAN, params)
+#define scm_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_SCAN, params)
+#define scm_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_SCAN, params)
+#define scm_info(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_SCAN, params)
+#define scm_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_SCAN, params)
 
 #define scm_hex_dump(level, data, buf_len) \
 		qdf_trace_hex_dump(QDF_MODULE_ID_SCAN, level, data, buf_len)
diff --git a/umac/tdls/core/src/wlan_tdls_main.h b/umac/tdls/core/src/wlan_tdls_main.h
index b2a0a86137..d9cd88864d 100644
--- a/umac/tdls/core/src/wlan_tdls_main.h
+++ b/umac/tdls/core/src/wlan_tdls_main.h
@@ -57,22 +57,16 @@
 #define TDLS_DISCOVERY_TIMEOUT_BEFORE_UPDATE     1000
 #define TDLS_SCAN_REJECT_MAX            5
 
-
-#define tdls_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_TDLS, level, ## args)
-#define tdls_logfl(level, format, args...) \
-	tdls_log(level, FL(format), ## args)
-
-#define tdls_debug(format, args...) \
-	tdls_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
-#define tdls_notice(format, args...) \
-	tdls_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define tdls_warn(format, args...) \
-	tdls_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define tdls_err(format, args...) \
-	tdls_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define tdls_alert(format, args...) \
-	tdls_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
+#define tdls_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_TDLS, params)
+#define tdls_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_TDLS, params)
+#define tdls_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_TDLS, params)
+#define tdls_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_TDLS, params)
+#define tdls_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_TDLS, params)
 
 #define TDLS_IS_LINK_CONNECTED(peer)  \
 	((TDLS_LINK_CONNECTED == (peer)->link_status) || \
diff --git a/umac/wifi_pos/src/wifi_pos_utils_i.h b/umac/wifi_pos/src/wifi_pos_utils_i.h
index c74d6e3ff7..bbf66e421d 100644
--- a/umac/wifi_pos/src/wifi_pos_utils_i.h
+++ b/umac/wifi_pos/src/wifi_pos_utils_i.h
@@ -34,21 +34,16 @@
 struct wlan_objmgr_psoc;
 struct wifi_pos_req_msg;
 
-#define wifi_pos_log(level, args...) \
-	QDF_TRACE(QDF_MODULE_ID_WIFIPOS, level, ## args)
-#define wifi_pos_logfl(level, format, args...) \
-	wifi_pos_log(level, FL(format), ## args)
-
-#define wifi_pos_alert(format, args...) \
-	wifi_pos_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
-#define wifi_pos_err(format, args...) \
-	wifi_pos_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
-#define wifi_pos_warn(format, args...) \
-	wifi_pos_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
-#define wifi_pos_notice(format, args...) \
-	wifi_pos_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
-#define wifi_pos_debug(format, args...) \
-	wifi_pos_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
+#define wifi_pos_alert(params...) \
+	QDF_TRACE_FATAL(QDF_MODULE_ID_WIFIPOS, params)
+#define wifi_pos_err(params...) \
+	QDF_TRACE_ERROR(QDF_MODULE_ID_WIFIPOS, params)
+#define wifi_pos_warn(params...) \
+	QDF_TRACE_WARN(QDF_MODULE_ID_WIFIPOS, params)
+#define wifi_pos_notice(params...) \
+	QDF_TRACE_INFO(QDF_MODULE_ID_WIFIPOS, params)
+#define wifi_pos_debug(params...) \
+	QDF_TRACE_DEBUG(QDF_MODULE_ID_WIFIPOS, params)
 
 #define OEM_APP_SIGNATURE_LEN      16
 #define OEM_APP_SIGNATURE_STR      "QUALCOMM-OEM-APP"