qcacld-3.0: Add QDF trace API's

Replace CDF trace API's with QDF trace API's.

Change-Id: I5b99dce73297f7de8f0755fa0b47dc3f84c78747
CRs-Fixed: 981188

141 files changed, 4469 insertions, 5908 deletions

diff --git a/core/bmi/inc/bmi.h b/core/bmi/inc/bmi.h
index 7ceb675a0e2a..eb0431e6c359 100644
--- a/core/bmi/inc/bmi.h
+++ b/core/bmi/inc/bmi.h
@@ -33,7 +33,7 @@
 #ifndef _BMI_H_
 #define _BMI_H_
 #include "bmi_msg.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "ol_if_athvar.h"
 #include "hif.h"
 
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index af516956201b..77cc3f713a94 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -120,9 +120,9 @@ static int ol_check_fw_hash(const u8 *data, u32 fw_size, ATH_BIN_FILE file)
 
 	if (cdf_mem_compare(hash, digest, SHA256_DIGEST_SIZE) != 0) {
 		BMI_ERR("Hash Mismatch");
-		cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		qdf_trace_hex_dump(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				   digest, SHA256_DIGEST_SIZE);
-		cdf_trace_hex_dump(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		qdf_trace_hex_dump(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				   hash, SHA256_DIGEST_SIZE);
 		ret = QDF_STATUS_E_FAILURE;
 	}
diff --git a/core/cdf/inc/cdf_trace.h b/core/cdf/inc/cdf_trace.h
deleted file mode 100644
index 4d198abaa75d..000000000000
--- a/core/cdf/inc/cdf_trace.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-#if !defined(__CDF_TRACE_H)
-#define __CDF_TRACE_H
-
-/**
- *  DOC:  cdf_trace
- *
- *  Connectivity driver framework trace APIs
- *
- *  Trace, logging, and debugging definitions and APIs
- *
- */
-
-/* Include Files */
-#include  <qdf_types.h>         /* For QDF_MODULE_ID... */
-#include  <stdarg.h>            /* For va_list... */
-#include  <qdf_status.h>
-#include  <cdf_nbuf.h>
-#include  <cds_packet.h>
-#include  <i_qdf_types.h>
-
-/* Type declarations */
-
-typedef enum {
-	/* NONE means NO traces will be logged.  This value is in place
-	 * for the cdf_trace_setlevel() to allow the user to turn off
-	 * all traces
-	 */
-	CDF_TRACE_LEVEL_NONE = 0,
-
-	/* Following trace levels are the ones that 'callers' of CDF_TRACE()
-	 * can specify in for the CDF_TRACE_LEVEL parameter.  Traces are
-	 * classified by severity. FATAL being more serious than INFO for
-	 * example
-	 */
-	CDF_TRACE_LEVEL_FATAL,
-	CDF_TRACE_LEVEL_ERROR,
-	CDF_TRACE_LEVEL_WARN,
-	CDF_TRACE_LEVEL_INFO,
-	CDF_TRACE_LEVEL_INFO_HIGH,
-	CDF_TRACE_LEVEL_INFO_MED,
-	CDF_TRACE_LEVEL_INFO_LOW,
-	CDF_TRACE_LEVEL_DEBUG,
-
-	/* All means all trace levels will be active.  This value is in place
-	 * for the cdf_trace_setlevel() to allow the user to turn ON all traces
-	 */
-	CDF_TRACE_LEVEL_ALL,
-
-	/* Not a real level.  Used to identify the maximum number of
-	 * CDF_TRACE_LEVELs defined
-	 */
-	CDF_TRACE_LEVEL_MAX
-} CDF_TRACE_LEVEL;
-
-/* By default Data Path module will have all log levels enabled, except debug
- * log level. Debug level will be left up to the framework or user space modules
- * to be enabled when issue is detected
- */
-#define CDF_DATA_PATH_TRACE_LEVEL \
-	((1 << CDF_TRACE_LEVEL_FATAL) | (1 << CDF_TRACE_LEVEL_ERROR) | \
-	(1 << CDF_TRACE_LEVEL_WARN) | (1 << CDF_TRACE_LEVEL_INFO) | \
-	(1 << CDF_TRACE_LEVEL_INFO_HIGH) | (1 << CDF_TRACE_LEVEL_INFO_MED) | \
-	(1 << CDF_TRACE_LEVEL_INFO_LOW))
-
-/* Preprocessor definitions and constants */
-#define ASSERT_BUFFER_SIZE (512)
-
-#define CDF_ENABLE_TRACING
-#define MAX_CDF_TRACE_RECORDS 4000
-#define INVALID_CDF_TRACE_ADDR 0xffffffff
-#define DEFAULT_CDF_TRACE_DUMP_COUNT 0
-
-#include  <i_cdf_trace.h>
-
-#ifdef TRACE_RECORD
-
-#define MTRACE(p) p
-#define NO_SESSION 0xFF
-
-#else
-#define MTRACE(p) {  }
-
-#endif
-
-/* Structure definition */
-typedef struct cdf_trace_record_s {
-	uint64_t time;
-	uint8_t module;
-	uint8_t code;
-	uint16_t session;
-	uint32_t data;
-	uint32_t pid;
-} cdf_trace_record_t, *tp_cdf_trace_record;
-
-typedef struct s_cdf_trace_data {
-	/* MTRACE logs are stored in ring buffer where head represents the
-	 * position of first record, tail represents the position of last record
-	 * added till now and num is the count of total record added
-	 */
-	uint32_t head;
-	uint32_t tail;
-	uint32_t num;
-	uint16_t numSinceLastDump;
-
-	/* config for controlling the trace */
-	uint8_t enable;
-	/* Dump after number of records reach this number */
-	uint16_t dumpCount;
-} t_cdf_trace_data;
-
-#define CASE_RETURN_STRING(str) case ((str)): return (uint8_t *)(# str);
-
-/* DP Trace Implementation */
-#define DPTRACE(p) p
-
-#define MAX_CDF_DP_TRACE_RECORDS       4000
-#define CDF_DP_TRACE_RECORD_SIZE       16
-#define INVALID_CDF_DP_TRACE_ADDR      0xffffffff
-#define CDF_DP_TRACE_VERBOSITY_HIGH    3
-#define CDF_DP_TRACE_VERBOSITY_MEDIUM  2
-#define CDF_DP_TRACE_VERBOSITY_LOW     1
-#define CDF_DP_TRACE_VERBOSITY_DEFAULT 0
-
-/**
- * enum CDF_DP_TRACE_ID - Generic ID to identify various events in data path
- * @CDF_DP_TRACE_INVALID: Invalid ID
- * @CDF_DP_TRACE_DROP_PACKET_RECORD: Dropped packet stored with this id
- * @CDF_DP_TRACE_HDD_PACKET_PTR_RECORD: nbuf->data ptr of HDD
- * @CDF_DP_TRACE_HDD_PACKET_RECORD: nbuf->data stored with this id
- * @CDF_DP_TRACE_CE_PACKET_PTR_RECORD: nbuf->data ptr of CE
- * @CDF_DP_TRACE_CE_PACKET_RECORD: nbuf->data stored with this id
- * @CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD: nbuf->data ptr of txrx queue
- * @CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD: nbuf->data ptr of txrx
- * @CDF_DP_TRACE_HTT_PACKET_PTR_RECORD: nbuf->data ptr of htt
- * @CDF_DP_TRACE_HTC_PACKET_PTR_RECORD: nbuf->data ptr of htc
- * @CDF_DP_TRACE_HIF_PACKET_PTR_RECORD: nbuf->data ptr of hif
- * @CDF_DP_TRACE_HDD_TX_TIMEOUT: hdd tx timeout event
- * @CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT: hdd tx softap timeout event
- * @CDF_DP_TRACE_VDEV_PAUSE: vdev pause event
- * @CDF_DP_TRACE_VDEV_UNPAUSE: vdev unpause event
- *
- */
-enum  CDF_DP_TRACE_ID {
-	CDF_DP_TRACE_INVALID                           = 0,
-	CDF_DP_TRACE_DROP_PACKET_RECORD                = 1,
-	CDF_DP_TRACE_HDD_PACKET_PTR_RECORD             = 2,
-	CDF_DP_TRACE_HDD_PACKET_RECORD                 = 3,
-	CDF_DP_TRACE_CE_PACKET_PTR_RECORD              = 4,
-	CDF_DP_TRACE_CE_PACKET_RECORD                  = 5,
-	CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD      = 6,
-	CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD            = 7,
-	CDF_DP_TRACE_HTT_PACKET_PTR_RECORD             = 8,
-	CDF_DP_TRACE_HTC_PACKET_PTR_RECORD             = 9,
-	CDF_DP_TRACE_HIF_PACKET_PTR_RECORD             = 10,
-	CDF_DP_TRACE_HDD_TX_TIMEOUT                    = 11,
-	CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT             = 12,
-	CDF_DP_TRACE_VDEV_PAUSE                        = 13,
-	CDF_DP_TRACE_VDEV_UNPAUSE                      = 14,
-	CDF_DP_TRACE_MAX
-
-};
-
-/**
- * struct cdf_dp_trace_record_s - Describes a record in DP trace
- * @time: time when it got stored
- * @code: Describes the particular event
- * @data: buffer to store data
- * @size: Length of the valid data stored in this record
- * @pid : process id which stored the data in this record
- */
-struct cdf_dp_trace_record_s {
-	uint64_t time;
-	uint8_t code;
-	uint8_t data[CDF_DP_TRACE_RECORD_SIZE];
-	uint8_t size;
-	uint32_t pid;
-};
-
-/**
- * struct cdf_dp_trace_data - Parameters to configure/control DP trace
- * @head: Position of first record
- * @tail: Position of last record
- * @num:  Current index
- * @proto_bitmap: defines which protocol to be traced
- * @no_of_record: defines every nth packet to be traced
- * @verbosity : defines verbosity level
- * @enable: enable/disable DP trace
- * @count: current packet number
- */
-struct s_cdf_dp_trace_data {
-	uint32_t head;
-	uint32_t tail;
-	uint32_t num;
-
-	/* config for controlling the trace */
-	uint8_t proto_bitmap;
-	uint8_t no_of_record;
-	uint8_t verbosity;
-	bool enable;
-	uint32_t count;
-};
-/* Function declarations and documenation */
-
-/**
- * cdf_trace_set_level() - Set the trace level for a particular module
- * @level : trace level
- *
- * Trace level is a member of the CDF_TRACE_LEVEL enumeration indicating
- * the severity of the condition causing the trace message to be issued.
- * More severe conditions are more likely to be logged.
- *
- * This is an external API that allows trace levels to be set for each module.
- *
- * Return:  nothing
- */
-void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level);
-
-/**
- * cdf_trace_get_level() - get the trace level
- * @level : trace level
- *
- * This is an external API that returns a bool value to signify if a
- * particular trace level is set for the specified module.
- * A member of the CDF_TRACE_LEVEL enumeration indicating the severity
- * of the condition causing the trace message to be issued.
- *
- * Note that individual trace levels are the only valid values
- * for this API.  CDF_TRACE_LEVEL_NONE and CDF_TRACE_LEVEL_ALL
- * are not valid input and will return false
- *
- * Return:
- *  false - the specified trace level for the specified module is OFF
- *  true - the specified trace level for the specified module is ON
- */
-bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level);
-
-typedef void (*tp_cdf_trace_cb)(void *pMac, tp_cdf_trace_record, uint16_t);
-void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data);
-void cdf_trace_register(QDF_MODULE_ID, tp_cdf_trace_cb);
-QDF_STATUS cdf_trace_spin_lock_init(void);
-void cdf_trace_init(void);
-void cdf_trace_enable(uint32_t, uint8_t enable);
-void cdf_trace_dump_all(void *, uint8_t, uint8_t, uint32_t, uint32_t);
-
-void cdf_dp_trace_spin_lock_init(void);
-void cdf_dp_trace_init(void);
-void cdf_dp_trace_set_value(uint8_t proto_bitmap, uint8_t no_of_records,
-			 uint8_t verbosity);
-void cdf_dp_trace_set_track(cdf_nbuf_t nbuf);
-void cdf_dp_trace(cdf_nbuf_t nbuf, enum CDF_DP_TRACE_ID code,
-			uint8_t *data, uint8_t size);
-void cdf_dp_trace_dump_all(uint32_t count);
-typedef void (*tp_cdf_dp_trace_cb)(struct cdf_dp_trace_record_s* , uint16_t);
-void cdf_dp_display_record(struct cdf_dp_trace_record_s *record,
-							uint16_t index);
-#endif
diff --git a/core/cdf/src/cdf_memory.c b/core/cdf/src/cdf_memory.c
index 0c4de4378690..547a3b68c050 100644
--- a/core/cdf/src/cdf_memory.c
+++ b/core/cdf/src/cdf_memory.c
@@ -34,7 +34,7 @@
 /* Include Files */
 #include "cdf_memory.h"
 #include "cdf_nbuf.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "qdf_lock.h"
 #include "qdf_mc_timer.h"
 
@@ -111,7 +111,7 @@ static inline void cdf_mem_save_stack_trace(struct s_cdf_mem_struct *mem_struct)
 static inline void cdf_mem_print_stack_trace(struct s_cdf_mem_struct
 					     *mem_struct)
 {
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 		  "Call stack for the source of leaked memory:");
 
 	print_stack_trace(&mem_struct->trace, 1);
@@ -164,7 +164,7 @@ void cdf_mem_clean(void)
 		unsigned int prev_mleak_sz = 0;
 		unsigned int mleak_cnt = 0;
 
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: List is not Empty. listSize %d ",
 			  __func__, (int)listSize);
 
@@ -182,8 +182,8 @@ void cdf_mem_clean(void)
 					memStruct->lineNum)
 				    || (prev_mleak_sz != memStruct->size)) {
 					if (mleak_cnt != 0) {
-						CDF_TRACE(QDF_MODULE_ID_QDF,
-							  CDF_TRACE_LEVEL_FATAL,
+						QDF_TRACE(QDF_MODULE_ID_QDF,
+							  QDF_TRACE_LEVEL_FATAL,
 							  "%d Time Memory Leak@ File %s, @Line %d, size %d",
 							  mleak_cnt,
 							  prev_mleak_file,
@@ -203,7 +203,7 @@ void cdf_mem_clean(void)
 
 		/* Print last memory leak from the module */
 		if (mleak_cnt) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				  "%d Time memory Leak@ File %s, @Line %d, size %d",
 				  mleak_cnt, prev_mleak_file,
 				  prev_mleak_lineNum, prev_mleak_sz);
@@ -252,7 +252,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 	unsigned long  time_before_kzalloc;
 
 	if (size > (1024 * 1024) || size == 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: called with invalid arg; passed in %zu !!!",
 			  __func__, size);
 		return NULL;
@@ -281,7 +281,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 	 */
 	if (qdf_mc_timer_get_system_time() - time_before_kzalloc >=
 					  CDF_GET_MEMORY_TIME_THRESHOLD)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			 "%s: kzalloc took %lu msec for size %zu called from %pS at line %d",
 			 __func__,
 			 qdf_mc_timer_get_system_time() - time_before_kzalloc,
@@ -306,7 +306,7 @@ void *cdf_mem_malloc_debug(size_t size, char *fileName, uint32_t lineNum)
 						   &memStruct->pNode);
 		qdf_spin_unlock_irqrestore(&cdf_mem_list_lock);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Unable to insert node into List qdf_status %d",
 				  __func__, qdf_status);
 		}
@@ -347,30 +347,30 @@ void cdf_mem_free(void *ptr)
 			if (0 == cdf_mem_compare(memStruct->header,
 						 &WLAN_MEM_HEADER[0],
 						 sizeof(WLAN_MEM_HEADER))) {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_FATAL,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_FATAL,
 					  "Memory Header is corrupted. MemInfo: Filename %s, LineNum %d",
 					  memStruct->fileName,
 					  (int)memStruct->lineNum);
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 			if (0 ==
 			    cdf_mem_compare((uint8_t *) ptr + memStruct->size,
 					    &WLAN_MEM_TAIL[0],
 					    sizeof(WLAN_MEM_TAIL))) {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_FATAL,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_FATAL,
 					  "Memory Trailer is corrupted. MemInfo: Filename %s, LineNum %d",
 					  memStruct->fileName,
 					  (int)memStruct->lineNum);
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 			kfree((void *)memStruct);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				  "%s: Unallocated memory (double free?)",
 				  __func__);
-			CDF_BUG(0);
+			QDF_BUG(0);
 		}
 	}
 }
@@ -396,7 +396,7 @@ void *cdf_mem_malloc(size_t size)
 	unsigned long  time_before_kzalloc;
 
 	if (size > (1024 * 1024) || size == 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: called with invalid arg; passed in %zu !!",
 			  __func__, size);
 		return NULL;
@@ -423,7 +423,7 @@ void *cdf_mem_malloc(size_t size)
 	 */
 	if (qdf_mc_timer_get_system_time() - time_before_kzalloc >=
 					   CDF_GET_MEMORY_TIME_THRESHOLD)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			 "%s: kzalloc took %lu msec for size %zu called from %pS",
 			 __func__,
 			 qdf_mc_timer_get_system_time() - time_before_kzalloc,
@@ -618,7 +618,7 @@ void cdf_mem_multi_pages_free(qdf_device_t osdev,
 void cdf_mem_set(void *ptr, uint32_t numBytes, uint32_t value)
 {
 	if (ptr == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter ptr", __func__);
 		return;
 	}
@@ -646,7 +646,7 @@ void cdf_mem_zero(void *ptr, uint32_t numBytes)
 	}
 
 	if (ptr == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter ptr", __func__);
 		return;
 	}
@@ -678,10 +678,10 @@ void cdf_mem_copy(void *pDst, const void *pSrc, uint32_t numBytes)
 	}
 
 	if ((pDst == NULL) || (pSrc == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, source:%p destination:%p",
 			  __func__, pSrc, pDst);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 	memcpy(pDst, pSrc, numBytes);
@@ -708,10 +708,10 @@ void cdf_mem_move(void *pDst, const void *pSrc, uint32_t numBytes)
 	}
 
 	if ((pDst == NULL) || (pSrc == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, source:%p destination:%p",
 			  __func__, pSrc, pDst);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 	memmove(pDst, pSrc, numBytes);
@@ -740,10 +740,10 @@ bool cdf_mem_compare(const void *pMemory1, const void *pMemory2,
 	}
 
 	if ((pMemory1 == NULL) || (pMemory2 == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s called with NULL parameter, p1:%p p2:%p",
 			  __func__, pMemory1, pMemory2);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return false;
 	}
 	return memcmp(pMemory1, pMemory2, numBytes) ? false : true;
diff --git a/core/cdf/src/cdf_nbuf.c b/core/cdf/src/cdf_nbuf.c
index 7ecaafa3d90f..af56eda6e002 100644
--- a/core/cdf/src/cdf_nbuf.c
+++ b/core/cdf/src/cdf_nbuf.c
@@ -43,7 +43,7 @@
 #include <qdf_types.h>
 #include <cdf_nbuf.h>
 #include <cdf_memory.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <qdf_status.h>
 #include <qdf_lock.h>
 
@@ -536,7 +536,7 @@ void cdf_net_buf_debug_exit(void)
 		while (p_node) {
 			p_prev = p_node;
 			p_node = p_node->p_next;
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				  "SKB buf memory Leak@ File %s, @Line %d, size %zu\n",
 				  p_prev->file_name, p_prev->line_num,
 				  p_prev->size);
@@ -632,10 +632,10 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size,
 	p_node = cdf_net_buf_debug_look_up(net_buf);
 
 	if (p_node) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Double allocation of skb ! Already allocated from %s %d",
 			  p_node->file_name, p_node->line_num);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto done;
 	} else {
 		p_node = (CDF_NBUF_TRACK *) cdf_mem_malloc(sizeof(*p_node));
@@ -647,10 +647,10 @@ void cdf_net_buf_debug_add_node(cdf_nbuf_t net_buf, size_t size,
 			p_node->p_next = gp_cdf_net_buf_track_tbl[i];
 			gp_cdf_net_buf_track_tbl[i] = p_node;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "Mem alloc failed ! Could not track skb from %s %d of size %zu",
 				  file_name, line_num, size);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 	}
 
@@ -706,10 +706,10 @@ void cdf_net_buf_debug_delete_node(cdf_nbuf_t net_buf)
 
 done:
 	if (!found) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Unallocated buffer ! Double free of net_buf %p ?",
 			  net_buf);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	spin_unlock_irqrestore(&g_cdf_net_buf_track_lock, irq_flag);
diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c
deleted file mode 100644
index 2009859f310c..000000000000
--- a/core/cdf/src/cdf_trace.c
+++ /dev/null
@@ -1,1012 +0,0 @@
-/*
- * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-/**
- *  DOC:  cdf_trace
- *
- *  Connectivity driver framework (CDF) trace APIs
- *
- *  Trace, logging, and debugging definitions and APIs
- *
- */
-
-/* Include Files */
-#include <cdf_trace.h>
-#include <ani_global.h>
-#include <wlan_logging_sock_svc.h>
-#include "qdf_time.h"
-/* Preprocessor definitions and constants */
-
-#define CDF_TRACE_BUFFER_SIZE (512)
-
-enum qdf_timestamp_unit qdf_log_timestamp_type = QDF_LOG_TIMESTAMP_UNIT;
-
-/* macro to map cdf trace levels into the bitmask */
-#define CDF_TRACE_LEVEL_TO_MODULE_BITMASK(_level) ((1 << (_level)))
-
-typedef struct {
-	/* Trace level for a module, as a bitmask.  The bits in this mask
-	 * are ordered by CDF_TRACE_LEVEL.  For example, each bit represents
-	 * one of the bits in CDF_TRACE_LEVEL that may be turned on to have
-	 * traces at that level logged, i.e. if CDF_TRACE_LEVEL_ERROR is
-	 * == 2, then if bit 2 (low order) is turned ON, then ERROR traces
-	 * will be printed to the trace log.
-	 * Note that all bits turned OFF means no traces
-	 */
-	uint16_t moduleTraceLevel;
-
-	/* 3 character string name for the module */
-	unsigned char moduleNameStr[4]; /* 3 chars plus the NULL */
-} moduleTraceInfo;
-
-#define CDF_DEFAULT_TRACE_LEVEL	\
-	((1 << CDF_TRACE_LEVEL_FATAL) | (1 << CDF_TRACE_LEVEL_ERROR))
-
-/* Array of static data that contains all of the per module trace
- * information.  This includes the trace level for the module and
- * the 3 character 'name' of the module for marking the trace logs
- */
-moduleTraceInfo g_cdf_trace_info[QDF_MODULE_ID_MAX] = {
-	[QDF_MODULE_ID_TLSHIM] = {CDF_DEFAULT_TRACE_LEVEL, "DP"},
-	[QDF_MODULE_ID_WMI] = {CDF_DEFAULT_TRACE_LEVEL, "WMI"},
-	[QDF_MODULE_ID_HDD] = {CDF_DEFAULT_TRACE_LEVEL, "HDD"},
-	[QDF_MODULE_ID_SME] = {CDF_DEFAULT_TRACE_LEVEL, "SME"},
-	[QDF_MODULE_ID_PE] = {CDF_DEFAULT_TRACE_LEVEL, "PE "},
-	[QDF_MODULE_ID_WMA] = {CDF_DEFAULT_TRACE_LEVEL, "WMA"},
-	[QDF_MODULE_ID_SYS] = {CDF_DEFAULT_TRACE_LEVEL, "SYS"},
-	[QDF_MODULE_ID_QDF] = {CDF_DEFAULT_TRACE_LEVEL, "CDF"},
-	[QDF_MODULE_ID_SAP] = {CDF_DEFAULT_TRACE_LEVEL, "SAP"},
-	[QDF_MODULE_ID_HDD_SOFTAP] = {CDF_DEFAULT_TRACE_LEVEL, "HSP"},
-	[QDF_MODULE_ID_HDD_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "HDP"},
-	[QDF_MODULE_ID_HDD_SAP_DATA] = {CDF_DEFAULT_TRACE_LEVEL, "SDP"},
-	[QDF_MODULE_ID_BMI] = {CDF_DEFAULT_TRACE_LEVEL, "BMI"},
-	[QDF_MODULE_ID_HIF] = {CDF_DEFAULT_TRACE_LEVEL, "HIF"},
-	[QDF_MODULE_ID_TXRX] = {CDF_DEFAULT_TRACE_LEVEL, "TRX"},
-	[QDF_MODULE_ID_HTT] = {CDF_DEFAULT_TRACE_LEVEL, "HTT"},
-};
-
-/* Static and Global variables */
-static spinlock_t ltrace_lock;
-
-static cdf_trace_record_t g_cdf_trace_tbl[MAX_CDF_TRACE_RECORDS];
-/* global cdf trace data */
-static t_cdf_trace_data g_cdf_trace_data;
-/*
- * all the call back functions for dumping MTRACE messages from ring buffer
- * are stored in cdf_trace_cb_table,these callbacks are initialized during init
- * only so, we will make a copy of these call back functions and maintain in to
- * cdf_trace_restore_cb_table. Incase if we make modifications to
- * cdf_trace_cb_table, we can certainly retrieve all the call back functions
- * back from Restore Table
- */
-static tp_cdf_trace_cb cdf_trace_cb_table[QDF_MODULE_ID_MAX];
-static tp_cdf_trace_cb cdf_trace_restore_cb_table[QDF_MODULE_ID_MAX];
-
-/* Static and Global variables */
-static spinlock_t l_dp_trace_lock;
-
-static struct cdf_dp_trace_record_s
-			g_cdf_dp_trace_tbl[MAX_CDF_DP_TRACE_RECORDS];
-
-/*
- * all the options to configure/control DP trace are
- * defined in this structure
- */
-static struct s_cdf_dp_trace_data g_cdf_dp_trace_data;
-/*
- * all the call back functions for dumping DPTRACE messages from ring buffer
- * are stored in cdf_dp_trace_cb_table, callbacks are initialized during init
- */
-static tp_cdf_dp_trace_cb cdf_dp_trace_cb_table[CDF_DP_TRACE_MAX];
-
-/**
- * cdf_trace_set_level() - Set the trace level for a particular module
- * @level : trace level
- *
- * Trace level is a member of the CDF_TRACE_LEVEL enumeration indicating
- * the severity of the condition causing the trace message to be issued.
- * More severe conditions are more likely to be logged.
- *
- * This is an external API that allows trace levels to be set for each module.
- *
- * Return:  nothing
- */
-void cdf_trace_set_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level)
-{
-	/* make sure the caller is passing in a valid LEVEL */
-	if (level >= CDF_TRACE_LEVEL_MAX) {
-		pr_err("%s: Invalid trace level %d passed in!\n", __func__,
-		       level);
-		return;
-	}
-
-	/* Treat 'none' differently.  NONE means we have to run off all
-	 * the bits in the bit mask so none of the traces appear. Anything
-	 * other than 'none' means we need to turn ON a bit in the bitmask
-	 */
-	if (CDF_TRACE_LEVEL_NONE == level)
-		g_cdf_trace_info[module].moduleTraceLevel =
-			CDF_TRACE_LEVEL_NONE;
-	else
-		/* set the desired bit in the bit mask for the module trace
-		 * level */
-		g_cdf_trace_info[module].moduleTraceLevel |=
-			CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level);
-}
-
-/**
- * cdf_trace_set_module_trace_level() - Set module trace level
- * @module: Module id
- * @level: Trace level for a module, as a bitmask as per 'moduleTraceInfo'
- *
- * Sets the module trace level where the trace level is given as a bit mask
- *
- * Return: None
- */
-void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level)
-{
-	if (module < 0 || module >= QDF_MODULE_ID_MAX) {
-		pr_err("%s: Invalid module id %d passed\n", __func__, module);
-		return;
-	}
-	g_cdf_trace_info[module].moduleTraceLevel = level;
-}
-
-void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-			 uint8_t on)
-{
-	/* make sure the caller is passing in a valid LEVEL */
-	if (level < 0 || level >= CDF_TRACE_LEVEL_MAX) {
-		pr_err("%s: Invalid trace level %d passed in!\n", __func__,
-		       level);
-		return;
-	}
-
-	/* make sure the caller is passing in a valid module */
-	if (module < 0 || module >= QDF_MODULE_ID_MAX) {
-		pr_err("%s: Invalid module id %d passed in!\n", __func__,
-		       module);
-		return;
-	}
-
-	/* Treat 'none' differently.  NONE means we have to turn off all
-	   the bits in the bit mask so none of the traces appear */
-	if (CDF_TRACE_LEVEL_NONE == level) {
-		g_cdf_trace_info[module].moduleTraceLevel =
-			CDF_TRACE_LEVEL_NONE;
-	}
-	/* Treat 'All' differently.  All means we have to turn on all
-	   the bits in the bit mask so all of the traces appear */
-	else if (CDF_TRACE_LEVEL_ALL == level) {
-		g_cdf_trace_info[module].moduleTraceLevel = 0xFFFF;
-	} else {
-		if (on)
-			/* set the desired bit in the bit mask for the module
-			   trace level */
-			g_cdf_trace_info[module].moduleTraceLevel |=
-				CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level);
-		else
-			/* clear the desired bit in the bit mask for the module
-			   trace level */
-			g_cdf_trace_info[module].moduleTraceLevel &=
-				~(CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level));
-	}
-}
-
-/**
- * cdf_trace_get_level() - get the trace level
- * @level : trace level
- *
- * This is an external API that returns a bool value to signify if a
- * particular trace level is set for the specified module.
- * A member of the CDF_TRACE_LEVEL enumeration indicating the severity
- * of the condition causing the trace message to be issued.
- *
- * Note that individual trace levels are the only valid values
- * for this API.  CDF_TRACE_LEVEL_NONE and CDF_TRACE_LEVEL_ALL
- * are not valid input and will return false
- *
- * Return:
- *      false - the specified trace level for the specified module is OFF
- *      true - the specified trace level for the specified module is ON
- */
-bool cdf_trace_get_level(QDF_MODULE_ID module, CDF_TRACE_LEVEL level)
-{
-	bool traceOn = false;
-
-	if ((CDF_TRACE_LEVEL_NONE == level) ||
-	    (CDF_TRACE_LEVEL_ALL == level) || (level >= CDF_TRACE_LEVEL_MAX)) {
-		traceOn = false;
-	} else {
-		traceOn = (level & g_cdf_trace_info[module].moduleTraceLevel)
-			  ? true : false;
-	}
-
-	return traceOn;
-}
-
-void cdf_snprintf(char *strBuffer, unsigned int size, char *strFormat, ...)
-{
-	va_list val;
-
-	va_start(val, strFormat);
-	snprintf(strBuffer, size, strFormat, val);
-	va_end(val);
-}
-
-#ifdef CDF_ENABLE_TRACING
-
-/**
- * cdf_trace_msg() - externally called trace function
- * @module : Module identifier a member of the QDF_MODULE_ID
- *	enumeration that identifies the module issuing the trace message.
- * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration
- *	indicating the severity of the condition causing the trace message
- *	to be issued.   More severe conditions are more likely to be logged.
- * @strFormat : Format string  in which the message to be logged.  This format
- *	string contains printf-like replacement parameters, which follow
- *	this parameter in the variable argument list.
- *
- *  Checks the level of severity and accordingly prints the trace messages
- *
- *  Return:  nothing
- *
- */
-void cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-		   char *strFormat, ...)
-{
-	char strBuffer[CDF_TRACE_BUFFER_SIZE];
-	int n;
-
-	/* Print the trace message when the desired level bit is set in
-	   the module tracel level mask */
-	if (g_cdf_trace_info[module].moduleTraceLevel &
-	    CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)) {
-		/* the trace level strings in an array.  these are ordered in
-		 * the same order as the trace levels are defined in the enum
-		 * (see CDF_TRACE_LEVEL) so we can index into this array with
-		 * the level and get the right string. The cdf trace levels
-		 * are... none, Fatal, Error, Warning, Info, InfoHigh, InfoMed,
-		 * InfoLow, Debug
-		 */
-		static const char *TRACE_LEVEL_STR[] = { "  ", "F ", "E ", "W ",
-						"I ", "IH", "IM", "IL", "D" };
-		va_list val;
-		va_start(val, strFormat);
-
-		/* print the prefix string into the string buffer... */
-		n = snprintf(strBuffer, CDF_TRACE_BUFFER_SIZE,
-			     "wlan: [%d:%2s:%3s] ",
-			     in_interrupt() ? 0 : current->pid,
-			     (char *)TRACE_LEVEL_STR[level],
-			     (char *)g_cdf_trace_info[module].moduleNameStr);
-
-		/* print the formatted log message after the prefix string */
-		if ((n >= 0) && (n < CDF_TRACE_BUFFER_SIZE)) {
-			vsnprintf(strBuffer + n, CDF_TRACE_BUFFER_SIZE - n,
-				  strFormat, val);
-#if defined(WLAN_LOGGING_SOCK_SVC_ENABLE)
-			wlan_log_to_user(level, (char *)strBuffer,
-					 strlen(strBuffer));
-#else
-			pr_err("%s\n", strBuffer);
-#endif
-		}
-		va_end(val);
-	}
-}
-
-void cdf_trace_display(void)
-{
-	QDF_MODULE_ID moduleId;
-
-	pr_err
-		("     1)FATAL  2)ERROR  3)WARN  4)INFO  5)INFO_H  6)INFO_M  7)INFO_L 8)DEBUG\n");
-	for (moduleId = 0; moduleId < QDF_MODULE_ID_MAX; ++moduleId) {
-		pr_err
-			("%2d)%s    %s        %s       %s       %s        %s         %s         %s        %s\n",
-			(int)moduleId, g_cdf_trace_info[moduleId].moduleNameStr,
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_FATAL)) ? "X" :
-			" ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_ERROR)) ? "X" :
-			" ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_WARN)) ? "X" :
-			" ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO)) ? "X" :
-			" ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_HIGH)) ? "X"
-			: " ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_MED)) ? "X"
-			: " ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_INFO_LOW)) ? "X"
-			: " ",
-			(g_cdf_trace_info[moduleId].
-			 moduleTraceLevel & (1 << CDF_TRACE_LEVEL_DEBUG)) ? "X" :
-			" ");
-	}
-}
-
-#define ROW_SIZE 16
-/* Buffer size = data bytes(2 hex chars plus space) + NULL */
-#define BUFFER_SIZE ((ROW_SIZE * 3) + 1)
-
-/**
- * cdf_trace_hex_dump() - externally called hex dump function
- * @module : Module identifier a member of the QDF_MODULE_ID enumeration that
- *	     identifies the module issuing the trace message.
- * @level : Trace level a member of the CDF_TRACE_LEVEL enumeration indicating
- *	    the severity of the condition causing the trace message to be
- *	    issued. More severe conditions are more likely to be logged.
- * @data : The base address of the buffer to be logged.
- * @buf_len : The size of the buffer to be logged.
- *
- *  Checks the level of severity and accordingly prints the trace messages
- *
- *  Return :  nothing
- */
-void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-			void *data, int buf_len)
-{
-	const u8 *ptr = data;
-	int i, linelen, remaining = buf_len;
-	unsigned char linebuf[BUFFER_SIZE];
-
-	if (!(g_cdf_trace_info[module].moduleTraceLevel &
-		CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)))
-		return;
-
-	for (i = 0; i < buf_len; i += ROW_SIZE) {
-		linelen = min(remaining, ROW_SIZE);
-		remaining -= ROW_SIZE;
-
-		hex_dump_to_buffer(ptr + i, linelen, ROW_SIZE, 1,
-				linebuf, sizeof(linebuf), false);
-
-		cdf_trace_msg(module, level, "%.8x: %s", i, linebuf);
-	}
-}
-
-#endif
-
-/**
- * cdf_trace_enable() - Enable MTRACE for specific modules
- * @bitmask_of_moduleId : Bitmask according to enum of the modules.
- *  32 [dec]  = 0010 0000 [bin] <enum of HDD is 5>
- *  64 [dec]  = 0100 0000 [bin] <enum of SME is 6>
- *  128 [dec] = 1000 0000 [bin] <enum of PE is 7>
- * @enable : can be true or false true implies enabling MTRACE false implies
- *		disabling MTRACE.
- *
- * Enable MTRACE for specific modules whose bits are set in bitmask and enable
- * is true. if enable is false it disables MTRACE for that module. set the
- * bitmask according to enum value of the modules.
- * This functions will be called when you issue ioctl as mentioned following
- * [iwpriv wlan0 setdumplog <value> <enable>].
- * <value> - Decimal number, i.e. 64 decimal value shows only SME module,
- * 128 decimal value shows only PE module, 192 decimal value shows PE and SME.
- *
- *
- * Return : nothing
- */
-void cdf_trace_enable(uint32_t bitmask_of_moduleId, uint8_t enable)
-{
-	int i;
-	if (bitmask_of_moduleId) {
-		for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
-			if (((bitmask_of_moduleId >> i) & 1)) {
-				if (enable) {
-					if (NULL !=
-					    cdf_trace_restore_cb_table[i]) {
-						cdf_trace_cb_table[i] =
-						cdf_trace_restore_cb_table[i];
-					}
-				} else {
-					cdf_trace_restore_cb_table[i] =
-						cdf_trace_cb_table[i];
-					cdf_trace_cb_table[i] = NULL;
-				}
-			}
-		}
-	} else {
-		if (enable) {
-			for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
-				if (NULL != cdf_trace_restore_cb_table[i]) {
-					cdf_trace_cb_table[i] =
-						cdf_trace_restore_cb_table[i];
-				}
-			}
-		} else {
-			for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
-				cdf_trace_restore_cb_table[i] =
-					cdf_trace_cb_table[i];
-				cdf_trace_cb_table[i] = NULL;
-			}
-		}
-	}
-}
-
-/**
- * cdf_trace_init() - initializes cdf trace structures and variables
- *
- * Called immediately after cds_preopen, so that we can start recording HDD
- * events ASAP.
- *
- * Return : nothing
- */
-void cdf_trace_init(void)
-{
-	uint8_t i;
-	g_cdf_trace_data.head = INVALID_CDF_TRACE_ADDR;
-	g_cdf_trace_data.tail = INVALID_CDF_TRACE_ADDR;
-	g_cdf_trace_data.num = 0;
-	g_cdf_trace_data.enable = true;
-	g_cdf_trace_data.dumpCount = DEFAULT_CDF_TRACE_DUMP_COUNT;
-	g_cdf_trace_data.numSinceLastDump = 0;
-
-	for (i = 0; i < QDF_MODULE_ID_MAX; i++) {
-		cdf_trace_cb_table[i] = NULL;
-		cdf_trace_restore_cb_table[i] = NULL;
-	}
-}
-
-/**
- * cdf_trace() - puts the messages in to ring-buffer
- * @module : Enum of module, basically module id.
- * @param : Code to be recorded
- * @session : Session ID of the log
- * @data : Actual message contents
- *
- * This function will be called from each module who wants record the messages
- * in circular queue. Before calling this functions make sure you have
- * registered your module with cdf through cdf_trace_register function.
- *
- *
- * Return : nothing
- */
-void cdf_trace(uint8_t module, uint8_t code, uint16_t session, uint32_t data)
-{
-	tp_cdf_trace_record rec = NULL;
-	unsigned long flags;
-
-	if (!g_cdf_trace_data.enable)
-		return;
-
-	/* if module is not registered, don't record for that module */
-	if (NULL == cdf_trace_cb_table[module])
-		return;
-
-	/* Aquire the lock so that only one thread at a time can fill the ring
-	 * buffer
-	 */
-	spin_lock_irqsave(&ltrace_lock, flags);
-
-	g_cdf_trace_data.num++;
-
-	if (g_cdf_trace_data.num > MAX_CDF_TRACE_RECORDS)
-		g_cdf_trace_data.num = MAX_CDF_TRACE_RECORDS;
-
-	if (INVALID_CDF_TRACE_ADDR == g_cdf_trace_data.head) {
-		/* first record */
-		g_cdf_trace_data.head = 0;
-		g_cdf_trace_data.tail = 0;
-	} else {
-		/* queue is not empty */
-		uint32_t tail = g_cdf_trace_data.tail + 1;
-
-		if (MAX_CDF_TRACE_RECORDS == tail)
-			tail = 0;
-
-		if (g_cdf_trace_data.head == tail) {
-			/* full */
-			if (MAX_CDF_TRACE_RECORDS == ++g_cdf_trace_data.head)
-				g_cdf_trace_data.head = 0;
-		}
-		g_cdf_trace_data.tail = tail;
-	}
-
-	rec = &g_cdf_trace_tbl[g_cdf_trace_data.tail];
-	rec->code = code;
-	rec->session = session;
-	rec->data = data;
-	rec->time = qdf_get_log_timestamp();
-	rec->module = module;
-	rec->pid = (in_interrupt() ? 0 : current->pid);
-	g_cdf_trace_data.numSinceLastDump++;
-	spin_unlock_irqrestore(&ltrace_lock, flags);
-}
-
-/**
- * cdf_trace_spin_lock_init() - initializes the lock variable before use
- *
- * This function will be called from cds_alloc_global_context, we will have lock
- * available to use ASAP
- *
- * Return : nothing
- */
-QDF_STATUS cdf_trace_spin_lock_init(void)
-{
-	spin_lock_init(&ltrace_lock);
-
-	return QDF_STATUS_SUCCESS;
-}
-
-/**
- * cdf_trace_register() - registers the call back functions
- * @moduleID - enum value of module
- * @cdf_trace_callback - call back functions to display the messages in
- *  particular format.
- *
- * Registers the call back functions to display the messages in particular
- * format mentioned in these call back functions. This functions should be
- * called by interested module in their init part as we will be ready to
- * register as soon as modules are up.
- *
- * Return : nothing
- */
-void cdf_trace_register(QDF_MODULE_ID moduleID,
-			tp_cdf_trace_cb cdf_trace_callback)
-{
-	cdf_trace_cb_table[moduleID] = cdf_trace_callback;
-}
-
-/**
- * cdf_trace_dump_all() - Dump data from ring buffer via call back functions
- *			  registered with CDF
- * @pMac : Context of particular module
- * @code : Reason code
- * @session : Session id of log
- * @count : Number of lines to dump starting from tail to head
- *
- * This function will be called up on issueing ioctl call as mentioned following
- * [iwpriv wlan0 dumplog 0 0 <n> <bitmask_of_module>]
- *
- *  <n> - number lines to dump starting from tail to head.
- *
- *  <bitmask_of_module> - if anybody wants to know how many messages were
- *  recorded for particular module/s mentioned by setbit in bitmask from last
- *  <n> messages. It is optional, if you don't provide then it will dump
- *  everything from buffer.
- *
- * Return : nothing
- */
-void cdf_trace_dump_all(void *pMac, uint8_t code, uint8_t session,
-			uint32_t count, uint32_t bitmask_of_module)
-{
-	cdf_trace_record_t pRecord;
-	int32_t i, tail;
-
-	if (!g_cdf_trace_data.enable) {
-		CDF_TRACE(QDF_MODULE_ID_SYS,
-			  CDF_TRACE_LEVEL_ERROR, "Tracing Disabled");
-		return;
-	}
-
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
-		  "Total Records: %d, Head: %d, Tail: %d",
-		  g_cdf_trace_data.num, g_cdf_trace_data.head,
-		  g_cdf_trace_data.tail);
-
-	/* aquire the lock so that only one thread at a time can read
-	 * the ring buffer
-	 */
-	spin_lock(&ltrace_lock);
-
-	if (g_cdf_trace_data.head != INVALID_CDF_TRACE_ADDR) {
-		i = g_cdf_trace_data.head;
-		tail = g_cdf_trace_data.tail;
-
-		if (count) {
-			if (count > g_cdf_trace_data.num)
-				count = g_cdf_trace_data.num;
-			if (tail >= (count - 1))
-				i = tail - count + 1;
-			else if (count != MAX_CDF_TRACE_RECORDS)
-				i = MAX_CDF_TRACE_RECORDS - ((count - 1) -
-							     tail);
-		}
-
-		pRecord = g_cdf_trace_tbl[i];
-		/* right now we are not using numSinceLastDump member but
-		 * in future we might re-visit and use this member to track
-		 * how many latest messages got added while we were dumping
-		 * from ring buffer
-		 */
-		g_cdf_trace_data.numSinceLastDump = 0;
-		spin_unlock(&ltrace_lock);
-		for (;; ) {
-			if ((code == 0 || (code == pRecord.code)) &&
-			    (cdf_trace_cb_table[pRecord.module] != NULL)) {
-				if (0 == bitmask_of_module) {
-					cdf_trace_cb_table[pRecord.
-							   module] (pMac,
-								    &pRecord,
-								    (uint16_t)
-								    i);
-				} else {
-					if (bitmask_of_module &
-					    (1 << pRecord.module)) {
-						cdf_trace_cb_table[pRecord.
-								   module]
-							(pMac, &pRecord,
-							(uint16_t) i);
-					}
-				}
-			}
-
-			if (i == tail)
-				break;
-			i += 1;
-
-			spin_lock(&ltrace_lock);
-			if (MAX_CDF_TRACE_RECORDS == i) {
-				i = 0;
-				pRecord = g_cdf_trace_tbl[0];
-			} else {
-				pRecord = g_cdf_trace_tbl[i];
-			}
-			spin_unlock(&ltrace_lock);
-		}
-	} else {
-		spin_unlock(&ltrace_lock);
-	}
-}
-
-/**
- * cdf_dp_trace_init() - enables the DP trace
- * Called during driver load and it enables DP trace
- *
- * Return: None
- */
-void cdf_dp_trace_init(void)
-{
-	uint8_t i;
-
-	cdf_dp_trace_spin_lock_init();
-	g_cdf_dp_trace_data.head = INVALID_CDF_DP_TRACE_ADDR;
-	g_cdf_dp_trace_data.tail = INVALID_CDF_DP_TRACE_ADDR;
-	g_cdf_dp_trace_data.num = 0;
-	g_cdf_dp_trace_data.proto_bitmap = 0;
-	g_cdf_dp_trace_data.no_of_record = 0;
-	g_cdf_dp_trace_data.verbosity    = CDF_DP_TRACE_VERBOSITY_DEFAULT;
-	g_cdf_dp_trace_data.enable = true;
-
-	for (i = 0; i < CDF_DP_TRACE_MAX; i++)
-		cdf_dp_trace_cb_table[i] = cdf_dp_display_record;
-}
-
-/**
- * cdf_dp_trace_set_value() - Configure the value to control DP trace
- * @proto_bitmap  : defines the protocol to be tracked
- * @no_of_records : defines the nth packet which is traced
- * @verbosity     : defines the verbosity level
- *
- * Return: None
- */
-void cdf_dp_trace_set_value(uint8_t proto_bitmap, uint8_t no_of_record,
-			 uint8_t verbosity)
-{
-	g_cdf_dp_trace_data.proto_bitmap = proto_bitmap;
-	g_cdf_dp_trace_data.no_of_record = no_of_record;
-	g_cdf_dp_trace_data.verbosity    = verbosity;
-	return;
-}
-
-/**
- * cdf_dp_trace_enable_track() - enable the tracing for netbuf
- * @code : defines the event
- *
- * Return: true or false depends on whether tracing enabled
- */
-static bool cdf_dp_trace_enable_track(enum CDF_DP_TRACE_ID code)
-{
-	if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_HIGH)
-		return true;
-	if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_MEDIUM
-		&& (code <= CDF_DP_TRACE_HIF_PACKET_PTR_RECORD))
-		return true;
-	if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_LOW
-		&& (code <= CDF_DP_TRACE_CE_PACKET_RECORD))
-		return true;
-	if (g_cdf_dp_trace_data.verbosity == CDF_DP_TRACE_VERBOSITY_DEFAULT
-		&& (code == CDF_DP_TRACE_DROP_PACKET_RECORD))
-		return true;
-	return false;
-}
-
-/**
- * cdf_dp_trace_set_track() - Marks whether the packet needs to be traced
- * @nbuf  : defines the netbuf
- *
- * Return: None
- */
-void cdf_dp_trace_set_track(cdf_nbuf_t nbuf)
-{
-	spin_lock_bh(&l_dp_trace_lock);
-	g_cdf_dp_trace_data.count++;
-	if (g_cdf_dp_trace_data.proto_bitmap != 0) {
-		if (cds_pkt_get_proto_type(nbuf,
-			g_cdf_dp_trace_data.proto_bitmap, 0)) {
-			NBUF_CB_TX_DP_TRACE(nbuf) = 1;
-		}
-	}
-	if ((g_cdf_dp_trace_data.no_of_record != 0) &&
-		(g_cdf_dp_trace_data.count %
-			g_cdf_dp_trace_data.no_of_record == 0)) {
-		NBUF_CB_TX_DP_TRACE(nbuf) = 1;
-	}
-	spin_unlock_bh(&l_dp_trace_lock);
-	return;
-}
-
-/**
- * dump_hex_trace() - Display the data in buffer
- * @buf:     buffer which contains data to be displayed
- * @buf_len: defines the size of the data to be displayed
- *
- * Return: None
- */
-static void dump_hex_trace(uint8_t *buf, uint8_t buf_len)
-{
-	uint8_t i = 0;
-	/* Dump the bytes in the last line */
-	qdf_print("DATA: ");
-	for (i = 0; i < buf_len; i++)
-		qdf_print("%02x ", buf[i]);
-	qdf_print("\n");
-}
-
-/**
- * cdf_dp_display_trace() - Displays a record in DP trace
- * @pRecord  : pointer to a record in DP trace
- * @recIndex : record index
- *
- * Return: None
- */
-void cdf_dp_display_record(struct cdf_dp_trace_record_s *pRecord,
-				uint16_t recIndex)
-{
-	qdf_print("INDEX: %04d TIME: %012llu CODE: %02d\n", recIndex,
-						pRecord->time, pRecord->code);
-	switch (pRecord->code) {
-	case  CDF_DP_TRACE_HDD_TX_TIMEOUT:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
-						"HDD TX Timeout\n");
-		break;
-	case  CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
-						"HDD SoftAP TX Timeout\n");
-		break;
-	case  CDF_DP_TRACE_VDEV_PAUSE:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
-						"VDEV Pause\n");
-		break;
-	case  CDF_DP_TRACE_VDEV_UNPAUSE:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
-						"VDEV UnPause\n");
-		break;
-	default:
-		dump_hex_trace(pRecord->data, pRecord->size);
-	}
-	return;
-}
-
-/**
- * cdf_dp_trace() - Stores the data in buffer
- * @nbuf  : defines the netbuf
- * @code : defines the event
- * @data : defines the data to be stored
- * @size : defines the size of the data record
- *
- * Return: None
- */
-void cdf_dp_trace(cdf_nbuf_t nbuf, enum CDF_DP_TRACE_ID code,
-			uint8_t *data, uint8_t size)
-{
-	struct cdf_dp_trace_record_s *rec = NULL;
-
-	/* Return when Dp trace is not enabled */
-	if (!g_cdf_dp_trace_data.enable)
-		return;
-
-	/* If nbuf is NULL, check for VDEV PAUSE, UNPAUSE, TIMEOUT */
-	if (!nbuf) {
-		switch (code) {
-		case CDF_DP_TRACE_HDD_TX_TIMEOUT:
-		case CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT:
-		case CDF_DP_TRACE_VDEV_PAUSE:
-		case CDF_DP_TRACE_VDEV_UNPAUSE:
-			if (cdf_dp_trace_enable_track(code))
-				goto  register_record;
-			else
-				return;
-
-		default:
-			return;
-		}
-	}
-
-	/* Return when the packet is not a data packet */
-	if (NBUF_CB_TX_PACKET_TRACK(nbuf) != NBUF_TX_PKT_DATA_TRACK)
-		return;
-
-	/* Return when nbuf is not marked for dp tracing or
-	 * verbosity does not allow
-	 */
-	if ((cdf_dp_trace_enable_track(code) == false) ||
-	    !NBUF_CB_TX_DP_TRACE(nbuf))
-		return;
-
-	/* Acquire the lock so that only one thread at a time can fill the ring
-	 * buffer
-	 */
-
-register_record:
-
-	spin_lock_bh(&l_dp_trace_lock);
-
-	g_cdf_dp_trace_data.num++;
-
-	if (g_cdf_dp_trace_data.num > MAX_CDF_DP_TRACE_RECORDS)
-		g_cdf_dp_trace_data.num = MAX_CDF_DP_TRACE_RECORDS;
-
-	if (INVALID_CDF_DP_TRACE_ADDR == g_cdf_dp_trace_data.head) {
-		/* first record */
-		g_cdf_dp_trace_data.head = 0;
-		g_cdf_dp_trace_data.tail = 0;
-	} else {
-		/* queue is not empty */
-		g_cdf_dp_trace_data.tail++;
-
-		if (MAX_CDF_DP_TRACE_RECORDS == g_cdf_dp_trace_data.tail)
-			g_cdf_dp_trace_data.tail = 0;
-
-		if (g_cdf_dp_trace_data.head == g_cdf_dp_trace_data.tail) {
-			/* full */
-			if (MAX_CDF_DP_TRACE_RECORDS ==
-				++g_cdf_dp_trace_data.head)
-				g_cdf_dp_trace_data.head = 0;
-		}
-	}
-
-	rec = &g_cdf_dp_trace_tbl[g_cdf_dp_trace_data.tail];
-	rec->code = code;
-	rec->size = 0;
-	if (data != NULL && size > 0) {
-		if (size > CDF_DP_TRACE_RECORD_SIZE)
-			size = CDF_DP_TRACE_RECORD_SIZE;
-
-		rec->size = size;
-		switch (code) {
-		case CDF_DP_TRACE_HDD_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_CE_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_HTT_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_HTC_PACKET_PTR_RECORD:
-		case CDF_DP_TRACE_HIF_PACKET_PTR_RECORD:
-			cdf_mem_copy(rec->data, (uint8_t *)(&data), size);
-			break;
-
-		case CDF_DP_TRACE_DROP_PACKET_RECORD:
-		case CDF_DP_TRACE_HDD_PACKET_RECORD:
-		case CDF_DP_TRACE_CE_PACKET_RECORD:
-			cdf_mem_copy(rec->data, data, size);
-			break;
-		default:
-			break;
-		}
-	}
-	rec->time = qdf_get_log_timestamp();
-	rec->pid = (in_interrupt() ? 0 : current->pid);
-	spin_unlock_bh(&l_dp_trace_lock);
-}
-
-/**
- * cdf_dp_trace_spin_lock_init() - initializes the lock variable before use
- * This function will be called from cds_alloc_global_context, we will have lock
- * available to use ASAP
- *
- * Return : nothing
- */
-void cdf_dp_trace_spin_lock_init(void)
-{
-	spin_lock_init(&l_dp_trace_lock);
-
-	return;
-}
-
-/**
- * cdf_dp_trace_dump_all() - Dump data from ring buffer via call back functions
- *			  registered with CDF
- * @code : Reason code
- * @count : Number of lines to dump starting from tail to head
- *
- * Return : nothing
- */
-void cdf_dp_trace_dump_all(uint32_t count)
-{
-	struct cdf_dp_trace_record_s pRecord;
-	int32_t i, tail;
-
-	if (!g_cdf_dp_trace_data.enable) {
-		CDF_TRACE(QDF_MODULE_ID_SYS,
-			  CDF_TRACE_LEVEL_ERROR, "Tracing Disabled");
-		return;
-	}
-
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
-		  "Total Records: %d, Head: %d, Tail: %d",
-		  g_cdf_dp_trace_data.num, g_cdf_dp_trace_data.head,
-		  g_cdf_dp_trace_data.tail);
-
-	/* aquire the lock so that only one thread at a time can read
-	 * the ring buffer
-	 */
-	spin_lock_bh(&l_dp_trace_lock);
-
-	if (g_cdf_dp_trace_data.head != INVALID_CDF_DP_TRACE_ADDR) {
-		i = g_cdf_dp_trace_data.head;
-		tail = g_cdf_dp_trace_data.tail;
-
-		if (count) {
-			if (count > g_cdf_dp_trace_data.num)
-				count = g_cdf_dp_trace_data.num;
-			if (tail >= (count - 1))
-				i = tail - count + 1;
-			else if (count != MAX_CDF_DP_TRACE_RECORDS)
-				i = MAX_CDF_DP_TRACE_RECORDS - ((count - 1) -
-							     tail);
-		}
-
-		pRecord = g_cdf_dp_trace_tbl[i];
-		spin_unlock_bh(&l_dp_trace_lock);
-		for (;; ) {
-
-			cdf_dp_trace_cb_table[pRecord.
-					   code] (&pRecord, (uint16_t)i);
-			if (i == tail)
-				break;
-			i += 1;
-
-			spin_lock_bh(&l_dp_trace_lock);
-			if (MAX_CDF_DP_TRACE_RECORDS == i)
-				i = 0;
-
-			pRecord = g_cdf_dp_trace_tbl[i];
-			spin_unlock_bh(&l_dp_trace_lock);
-		}
-	} else {
-		spin_unlock_bh(&l_dp_trace_lock);
-	}
-}
diff --git a/core/cdf/src/i_cdf_trace.h b/core/cdf/src/i_cdf_trace.h
deleted file mode 100644
index 99973f2d5a56..000000000000
--- a/core/cdf/src/i_cdf_trace.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-
-#if !defined(__I_CDF_TRACE_H)
-#define __I_CDF_TRACE_H
-
-#if !defined(__printf)
-#define __printf(a, b)
-#endif
-
-/**
- * DOC: i_cdf_trace.h
- *
- * Linux-specific definitions for CDF trace
- *
- */
-
-/* Include Files */
-
-/**
- * cdf_trace_msg()- logging API
- * @module: Module identifier. A member of the QDF_MODULE_ID enumeration that
- *	    identifies the module issuing the trace message.
- * @level: Trace level. A member of the CDF_TRACE_LEVEL enumeration indicating
- *	   the severity of the condition causing the trace message to be issued.
- *	   More severe conditions are more likely to be logged.
- * @strFormat: Format string. The message to be logged. This format string
- *	       contains printf-like replacement parameters, which follow this
- *	       parameter in the variable argument list.
- *
- * Users wishing to add tracing information to their code should use
- * CDF_TRACE.  CDF_TRACE() will compile into a call to cdf_trace_msg() when
- * tracing is enabled.
- *
- * Return: nothing
- *
- */
-void __printf(3, 4) cdf_trace_msg(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-				  char *strFormat, ...);
-
-void cdf_trace_hex_dump(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-			void *data, int buf_len);
-
-void cdf_trace_display(void);
-
-void cdf_trace_set_value(QDF_MODULE_ID module, CDF_TRACE_LEVEL level,
-			 uint8_t on);
-
-void cdf_trace_set_module_trace_level(QDF_MODULE_ID module, uint32_t level);
-
-/* CDF_TRACE is the macro invoked to add trace messages to code.  See the
- * documenation for cdf_trace_msg() for the parameters etc. for this function.
- *
- * NOTE:  Code CDF_TRACE() macros into the source code.  Do not code directly
- * to the cdf_trace_msg() function.
- *
- * NOTE 2:  cdf tracing is totally turned off if WLAN_DEBUG is *not* defined.
- * This allows us to build 'performance' builds where we can measure performance
- * without being bogged down by all the tracing in the code
- */
-
-#if defined(WLAN_DEBUG)
-#define CDF_TRACE cdf_trace_msg
-#define CDF_TRACE_HEX_DUMP cdf_trace_hex_dump
-#else
-#define CDF_TRACE(arg ...)
-#define CDF_TRACE_HEX_DUMP(arg ...)
-#endif
-
-void __printf(3, 4) cdf_snprintf(char *strBuffer, unsigned int size,
-				 char *strFormat, ...);
-#define CDF_SNPRINTF cdf_snprintf
-
-#ifdef CDF_ENABLE_TRACING
-
-#define CDF_ASSERT(_condition) \
-	do { \
-		if (!(_condition)) { \
-			pr_err("CDF ASSERT in %s Line %d\n", \
-			       __func__, __LINE__); \
-			WARN_ON(1); \
-		} \
-	} while (0)
-
-#else
-
-/* This code will be used for compilation if tracing is to be compiled out */
-/* of the code so these functions/macros are 'do nothing' */
-static inline void cdf_trace_msg(QDF_MODULE_ID module, ...)
-{
-}
-
-#define CDF_ASSERT(_condition)
-
-#endif
-
-#ifdef PANIC_ON_BUG
-
-#define CDF_BUG(_condition) \
-	do { \
-		if (!(_condition)) { \
-			pr_err("CDF BUG in %s Line %d\n", \
-			       __func__, __LINE__); \
-			BUG_ON(1); \
-		} \
-	} while (0)
-
-#else
-
-#define CDF_BUG(_condition) \
-	do { \
-		if (!(_condition)) { \
-			pr_err("CDF BUG in %s Line %d\n", \
-			       __func__, __LINE__); \
-			WARN_ON(1); \
-		} \
-	} while (0)
-
-#endif
-
-#endif
diff --git a/core/cds/inc/cds_api.h b/core/cds/inc/cds_api.h
index 92773f5a88b8..225dedec8708 100644
--- a/core/cds/inc/cds_api.h
+++ b/core/cds/inc/cds_api.h
@@ -38,7 +38,7 @@
 #include <qdf_status.h>
 #include <cdf_memory.h>
 #include <qdf_list.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <qdf_event.h>
 #include <qdf_lock.h>
 #include <cds_reg_service.h>
diff --git a/core/cds/inc/cds_crypto.h b/core/cds/inc/cds_crypto.h
index 4827a49a5903..b0a4087a8090 100644
--- a/core/cds/inc/cds_crypto.h
+++ b/core/cds/inc/cds_crypto.h
@@ -38,7 +38,7 @@
 #include <qdf_status.h>
 #include <cdf_memory.h>
 #include <qdf_list.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <qdf_event.h>
 #include <qdf_lock.h>
 #include <cds_reg_service.h>
diff --git a/core/cds/inc/cds_utils.h b/core/cds/inc/cds_utils.h
index f14feb9b622f..66a30b38d587 100644
--- a/core/cds/inc/cds_utils.h
+++ b/core/cds/inc/cds_utils.h
@@ -66,21 +66,21 @@
 #define CDS_CHAN_15_FREQ       (2512)
 #define CDS_CHAN_170_FREQ      (5852)
 
-#define cds_log(level, args...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args)
+#define cds_log(level, args...) QDF_TRACE(QDF_MODULE_ID_QDF, level, ## args)
 #define cds_logfl(level, format, args...) cds_log(level, FL(format), ## args)
 
 #define cds_alert(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_FATAL, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
 #define cds_err(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_ERROR, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
 #define cds_warn(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_WARN, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
 #define cds_notice(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_INFO, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
 #define cds_info(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
 #define cds_debug(format, args...) \
-		cds_logfl(CDF_TRACE_LEVEL_DEBUG, format, ## args)
+		cds_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
 /*--------------------------------------------------------------------------
    Type declarations
    ------------------------------------------------------------------------*/
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 3f2c4890456f..d846d28f86dc 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -50,7 +50,7 @@
 #endif
 
 #include "sap_api.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "bmi.h"
 #include "ol_fw.h"
 #include "ol_if_athvar.h"
@@ -97,12 +97,12 @@ v_CONTEXT_t cds_init(void)
 	gp_cds_context->qdf_ctx = &g_cdf_ctx;
 	cdf_mem_zero(&g_cdf_ctx, sizeof(g_cdf_ctx));
 
-	cdf_trace_spin_lock_init();
+	qdf_trace_spin_lock_init();
 
 #if defined(TRACE_RECORD)
-	cdf_trace_init();
+	qdf_trace_init();
 #endif
-	cdf_dp_trace_init();
+	qdf_dp_trace_init();
 
 	cds_ssr_protect_init();
 
@@ -177,13 +177,13 @@ QDF_STATUS cds_open(void)
 	void *HTCHandle;
 	hdd_context_t *pHddCtx;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening CDS", __func__);
 
 	if (NULL == gp_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Trying to open CDS without a PreOpen", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -195,16 +195,16 @@ QDF_STATUS cds_open(void)
 
 	/* Initialize the probe event */
 	if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Unable to init probeEvent", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) !=
 	    QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Unable to init wmaCompleteEvent", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_probe_event;
 	}
 
@@ -212,10 +212,10 @@ QDF_STATUS cds_open(void)
 	qdf_status = cds_mq_init(&gp_cds_context->freeVosMq);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to initialize CDS free message queue",
 			  __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_wma_complete_event;
 	}
 
@@ -233,24 +233,24 @@ QDF_STATUS cds_open(void)
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to open CDS Scheduler", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_msg_queue;
 	}
 
 	pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext);
 	if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Hdd Context is Null", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_sched_close;
 	}
 
 	scn = cds_get_context(QDF_MODULE_ID_HIF);
 	if (!scn) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: scn is null!", __func__);
 		goto err_sched_close;
 	}
@@ -261,7 +261,7 @@ QDF_STATUS cds_open(void)
 	/* Initialize BMI and Download firmware */
 	qdf_status = bmi_download_firmware(ol_ctx);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "BMI FIALED status:%d", qdf_status);
 		goto err_bmi_close;
 	}
@@ -275,13 +275,13 @@ QDF_STATUS cds_open(void)
 	gp_cds_context->htc_ctx =
 		htc_create(scn, &htcInfo, qdf_ctx);
 	if (!gp_cds_context->htc_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);
 		goto err_bmi_close;
 	}
 
 	if (bmi_done(ol_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_htc_close;
 	}
@@ -373,9 +373,9 @@ QDF_STATUS cds_open(void)
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to open WMA module", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_htc_close;
 	}
 
@@ -387,12 +387,12 @@ QDF_STATUS cds_open(void)
 	pHddCtx->config->maxNumberOfPeers = mac_openParms.maxStation;
 	HTCHandle = cds_get_context(QDF_MODULE_ID_HTC);
 	if (!HTCHandle) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: HTCHandle is null!", __func__);
 		goto err_wma_close;
 	}
 	if (htc_wait_target(HTCHandle)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_wma_close;
 	}
@@ -410,9 +410,9 @@ QDF_STATUS cds_open(void)
 
 	if (eSIR_SUCCESS != sirStatus) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to open MAC", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_wma_close;
 	}
 
@@ -420,9 +420,9 @@ QDF_STATUS cds_open(void)
 	qdf_status = sme_open(gp_cds_context->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to open SME", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_mac_close;
 	}
 
@@ -432,13 +432,13 @@ QDF_STATUS cds_open(void)
 				    gp_cds_context->qdf_ctx);
 	if (!gp_cds_context->pdev_txrx_ctx) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to open TXRX", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_sme_close;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS successfully Opened", __func__);
 
 	return QDF_STATUS_SUCCESS;
@@ -490,32 +490,32 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context)
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	p_cds_contextType p_cds_context = (p_cds_contextType) cds_context;
 	void *scn;
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart");
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "cds prestart");
 
 	if (gp_cds_context != p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Context mismatch", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (p_cds_context->pMACContext == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: MAC NULL context", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (p_cds_context->pWMAContext == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WMA NULL context", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	scn = cds_get_context(QDF_MODULE_ID_HIF);
 	if (!scn) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: scn is null!", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -526,9 +526,9 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context)
 	/*call WMA pre start */
 	qdf_status = wma_pre_start(gp_cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL,
 			  "Failed to WMA prestart");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -537,46 +537,46 @@ QDF_STATUS cds_pre_enable(v_CONTEXT_t cds_context)
 					   CDS_WMA_TIMEOUT);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		if (qdf_status == QDF_STATUS_E_TIMEOUT) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Timeout occurred before WMA complete",
 				  __func__);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: wma_pre_start reporting other error",
 				  __func__);
 		}
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Test MC thread by posting a probe message to SYS",
 			  __func__);
 		wlan_sys_probe();
 
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	qdf_status = htc_start(gp_cds_context->htc_ctx);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL,
 			  "Failed to Start HTC");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	qdf_status = wma_wait_for_ready_event(gp_cds_context->pWMAContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "Failed to get ready event from target firmware");
 		htc_set_target_to_sleep(scn);
 		htc_stop(gp_cds_context->htc_ctx);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (ol_txrx_pdev_attach(gp_cds_context->pdev_txrx_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			"Failed to attach pdev");
 		htc_set_target_to_sleep(scn);
 		htc_stop(gp_cds_context->htc_ctx);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -599,12 +599,12 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context)
 	p_cds_contextType p_cds_context = (p_cds_contextType) cds_context;
 	tHalMacStartParameters halStartParams;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: Starting Libra SW", __func__);
 
 	/* We support only one instance for now ... */
 	if (gp_cds_context != p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: mismatch in context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -612,10 +612,10 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context)
 	if ((p_cds_context->pWMAContext == NULL) ||
 	    (p_cds_context->pMACContext == NULL)) {
 		if (p_cds_context->pWMAContext == NULL)
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: WMA NULL context", __func__);
 		else
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: MAC NULL context", __func__);
 
 		return QDF_STATUS_E_FAILURE;
@@ -624,11 +624,11 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context)
 	/* Start the wma */
 	qdf_status = wma_start(p_cds_context);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to start wma", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: wma correctly started", __func__);
 
 	/* Start the MAC */
@@ -640,36 +640,36 @@ QDF_STATUS cds_enable(v_CONTEXT_t cds_context)
 		mac_start(p_cds_context->pMACContext, &halStartParams);
 
 	if (eSIR_SUCCESS != sirStatus) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to start MAC", __func__);
 		goto err_wma_stop;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: MAC correctly started", __func__);
 
 	/* START SME */
 	qdf_status = sme_start(p_cds_context->pMACContext);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to start SME", __func__);
 		goto err_mac_stop;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: SME correctly started", __func__);
 
 	if (ol_txrx_pdev_attach_target
 		       (p_cds_context->pdev_txrx_ctx) != A_OK) {
-	   CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+	   QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 				"%s: Failed attach target", __func__);
 	   goto err_sme_stop;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "TL correctly started");
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: CDS Start is successful!!", __func__);
 
 	return QDF_STATUS_SUCCESS;
@@ -684,9 +684,9 @@ err_wma_stop:
 	qdf_event_reset(&(gp_cds_context->wmaCompleteEvent));
 	qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop wma", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 		wma_setneedshutdown(cds_context);
 	} else {
 		qdf_status =
@@ -694,17 +694,17 @@ err_wma_stop:
 					      CDS_WMA_TIMEOUT);
 		if (qdf_status != QDF_STATUS_SUCCESS) {
 			if (qdf_status == QDF_STATUS_E_TIMEOUT) {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_FATAL,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_FATAL,
 					  "%s: Timeout occurred before WMA_stop complete",
 					  __func__);
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_FATAL,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_FATAL,
 					  "%s: WMA_stop reporting other error",
 					  __func__);
 			}
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			wma_setneedshutdown(cds_context);
 		}
 	}
@@ -731,9 +731,9 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context)
 	qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop wma", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 		wma_setneedshutdown(cds_context);
 	}
 
@@ -743,9 +743,9 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context)
 	/* SYS STOP will stop SME and MAC */
 	qdf_status = sys_stop(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop SYS", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	return QDF_STATUS_SUCCESS;
@@ -764,9 +764,9 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = wma_wmi_work_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		 "%s: Failed to close wma_wmi_work", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	if (gp_cds_context->htc_ctx) {
@@ -781,53 +781,53 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close SME", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close MAC", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	((p_cds_contextType) cds_context)->pMACContext = NULL;
 
 	if (true == wma_needshutdown(cds_context)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Failed to shutdown wma", __func__);
 	} else {
 		qdf_status = wma_close(cds_context);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Failed to close wma", __func__);
-			CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+			QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 		}
 	}
 
 	qdf_status = wma_wmi_service_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close wma_wmi_service", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq);
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to destroy wmaCompleteEvent", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to destroy ProbeEvent", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	cds_deinit_log_completion();
@@ -855,7 +855,7 @@ void *cds_get_context(QDF_MODULE_ID moduleId)
 	void *pModContext = NULL;
 
 	if (gp_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: cds context pointer is null", __func__);
 		return NULL;
 	}
@@ -927,16 +927,16 @@ void *cds_get_context(QDF_MODULE_ID moduleId)
 
 	default:
 	{
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i does not have its context maintained by CDS",
 			  __func__, moduleId);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 	}
 
 	if (pModContext == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i context is Null", __func__,
 			  moduleId);
 	}
@@ -956,7 +956,7 @@ void *cds_get_context(QDF_MODULE_ID moduleId)
 v_CONTEXT_t cds_get_global_context(void)
 {
 	if (gp_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: global cds context is NULL", __func__);
 	}
 
@@ -973,7 +973,7 @@ v_CONTEXT_t cds_get_global_context(void)
 enum cds_driver_state cds_get_driver_state(void)
 {
 	if (gp_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: global cds context is NULL", __func__);
 
 		return CDS_DRIVER_STATE_UNINITIALIZED;
@@ -995,7 +995,7 @@ enum cds_driver_state cds_get_driver_state(void)
 void cds_set_driver_state(enum cds_driver_state state)
 {
 	if (gp_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: global cds context is NULL: %x", __func__,
 			  state);
 
@@ -1017,7 +1017,7 @@ void cds_set_driver_state(enum cds_driver_state state)
 void cds_clear_driver_state(enum cds_driver_state state)
 {
 	if (gp_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: global cds context is NULL: %x", __func__,
 			  state);
 
@@ -1047,13 +1047,13 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 	void **pGpModContext = NULL;
 
 	if (p_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: cds context is null", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if ((gp_cds_context != p_cds_context) || (ppModuleContext == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: context mismatch or null param passed",
 			  __func__);
 		return QDF_STATUS_E_FAILURE;
@@ -1085,11 +1085,11 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 	case QDF_MODULE_ID_HDD_SOFTAP:
 	default:
 	{
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i "
 			  "does not have its context allocated by CDS",
 			  __func__, moduleID);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 	}
@@ -1098,7 +1098,7 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 		/* Context has already been allocated!
 		 * Prevent double allocation
 		 */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i context has already been allocated",
 			  __func__, moduleID);
 		return QDF_STATUS_E_EXISTS;
@@ -1109,10 +1109,10 @@ QDF_STATUS cds_alloc_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 	*ppModuleContext = cdf_mem_malloc(size);
 
 	if (*ppModuleContext == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to " "allocate Context for module ID %i",
 			  __func__, moduleID);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_NOMEM;
 	}
 
@@ -1138,7 +1138,7 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context)
 	p_cds_contextType p_cds_context = cds_get_global_context();
 
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "cds context is Invald");
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
@@ -1148,10 +1148,10 @@ QDF_STATUS cds_set_context(QDF_MODULE_ID module_id, void *context)
 		p_cds_context->pHIFContext = context;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i does not have its context "
 			  "allocated by CDS", __func__, module_id);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -1177,7 +1177,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 
 	if ((p_cds_context == NULL) || (gp_cds_context != p_cds_context) ||
 	    (pModuleContext == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params or context mismatch", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1214,18 +1214,18 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 	case QDF_MODULE_ID_HDD_SOFTAP:
 	default:
 	{
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i "
 			  "does not have its context allocated by CDS",
 			  __func__, moduleID);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 	}
 
 	if (NULL == *pGpModContext) {
 		/* Context has not been allocated or freed already! */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Module ID %i "
 			  "context has not been allocated or freed already",
 			  __func__, moduleID);
@@ -1233,7 +1233,7 @@ QDF_STATUS cds_free_context(void *p_cds_context, QDF_MODULE_ID moduleID,
 	}
 
 	if (*pGpModContext != pModuleContext) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pGpModContext != pModuleContext", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1265,10 +1265,10 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 	uint32_t debug_count = 0;
 
 	if ((gp_cds_context == NULL) || (pMsg == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params or global cds context is null",
 			  __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1302,16 +1302,16 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 	}
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("%s: Trying to queue msg into unknown MC Msg queue ID %d"),
 			  __func__, msgQueueId);
 
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_ASSERT(NULL != pTargetMq);
+	QDF_ASSERT(NULL != pTargetMq);
 	if (pTargetMq == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pTargetMq == NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1322,12 +1322,12 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 	if (NULL == pMsgWrapper) {
 		debug_count = atomic_inc_return(&cds_wrapper_empty_count);
 		if (1 == debug_count)
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: CDS Core run out of message wrapper %d",
 				__func__, debug_count);
 
 		if (CDS_WRAPPER_MAX_FAIL_COUNT == debug_count)
-			CDF_BUG(0);
+			QDF_BUG(0);
 
 		return QDF_STATUS_E_RESOURCES;
 	}
@@ -1355,13 +1355,13 @@ QDF_STATUS cds_mq_post_message(CDS_MQ_ID msgQueueId, cds_msg_t *pMsg)
 void cds_sys_probe_thread_cback(void *pUserData)
 {
 	if (gp_cds_context != pUserData) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_context != pUserData", __func__);
 		return;
 	}
 
 	if (qdf_event_set(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: qdf_event_set failed", __func__);
 		return;
 	}
@@ -1376,14 +1376,14 @@ void cds_sys_probe_thread_cback(void *pUserData)
 void cds_wma_complete_cback(void *pUserData)
 {
 	if (gp_cds_context != pUserData) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_context != pUserData", __func__);
 		return;
 	}
 
 	if (qdf_event_set(&gp_cds_context->wmaCompleteEvent) !=
 	    QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: qdf_event_set failed", __func__);
 		return;
 	}
@@ -1400,18 +1400,18 @@ void cds_core_return_msg(void *pVContext, p_cds_msg_wrapper pMsgWrapper)
 {
 	p_cds_contextType p_cds_context = (p_cds_contextType) pVContext;
 
-	CDF_ASSERT(gp_cds_context == p_cds_context);
+	QDF_ASSERT(gp_cds_context == p_cds_context);
 
 	if (gp_cds_context != p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_context != p_cds_context", __func__);
 		return;
 	}
 
-	CDF_ASSERT(NULL != pMsgWrapper);
+	QDF_ASSERT(NULL != pMsgWrapper);
 
 	if (pMsgWrapper == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pMsgWrapper == NULL in function", __func__);
 		return;
 	}
@@ -1442,9 +1442,9 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context)
 
 	qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close SME", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 	/*
 	 * CAC timer will be initiated and started only when SAP starts on
@@ -1460,9 +1460,9 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context)
 
 	qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close MAC", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	((p_cds_contextType) cds_context)->pMACContext = NULL;
@@ -1471,17 +1471,17 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context)
 
 		qdf_status = wma_close(cds_context);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Failed to close wma!", __func__);
-			CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+			QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 		}
 	}
 
 	qdf_status = wma_wmi_work_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		"%s: Failed to close wma_wmi_work!", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	if (gp_cds_context->htc_ctx) {
@@ -1492,25 +1492,25 @@ QDF_STATUS cds_shutdown(v_CONTEXT_t cds_context)
 
 	qdf_status = wma_wmi_service_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close wma_wmi_service!", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	cds_mq_deinit(&((p_cds_contextType) cds_context)->freeVosMq);
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to destroy wmaCompleteEvent", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to destroy ProbeEvent", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	return QDF_STATUS_SUCCESS;
@@ -1554,7 +1554,7 @@ QDF_STATUS cds_get_vdev_types(enum tQDF_ADAPTER_MODE mode, uint32_t *type,
 		*type = WMI_VDEV_TYPE_OCB;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid device mode %d", mode);
 		status = QDF_STATUS_E_INVAL;
 		break;
@@ -1603,7 +1603,7 @@ bool cds_is_packet_log_enabled(void)
 
 	pHddCtx = (hdd_context_t *) (gp_cds_context->pHDDContext);
 	if ((NULL == pHddCtx) || (NULL == pHddCtx->config)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Hdd Context is Null", __func__);
 		return false;
 	}
@@ -1622,7 +1622,7 @@ void cds_trigger_recovery(void)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (!wma_handle) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"WMA context is invald!");
 		return;
 	}
@@ -1633,11 +1633,11 @@ void cds_trigger_recovery(void)
 		WMA_CRASH_INJECT_TIMEOUT);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"CRASH_INJECT command is timed out!");
  #ifdef CONFIG_CNSS
 		if (cds_is_driver_recovering()) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"Recovery is in progress, ignore!");
 			return;
 		}
@@ -1683,7 +1683,7 @@ void cds_set_wakelock_logging(bool value)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"cds context is Invald");
 		return;
 	}
@@ -1704,7 +1704,7 @@ bool cds_is_wakelock_enabled(void)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"cds context is Invald");
 		return false;
 	}
@@ -1728,7 +1728,7 @@ void cds_set_ring_log_level(uint32_t ring_id, uint32_t log_level)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invald", __func__);
 		return;
 	}
@@ -1781,7 +1781,7 @@ enum wifi_driver_log_level cds_get_ring_log_level(uint32_t ring_id)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invald", __func__);
 		return WLAN_LOG_LEVEL_OFF;
 	}
@@ -1843,7 +1843,7 @@ void cds_init_log_completion(void)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return;
 	}
@@ -1872,7 +1872,7 @@ void cds_deinit_log_completion(void)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return;
 	}
@@ -1899,7 +1899,7 @@ QDF_STATUS cds_set_log_completion(uint32_t is_fatal,
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1931,7 +1931,7 @@ void cds_get_log_completion(uint32_t *is_fatal,
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return;
 	}
@@ -1957,7 +1957,7 @@ bool cds_is_log_report_in_progress(void)
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return true;
 	}
@@ -1987,13 +1987,13 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal,
 
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: cds context is Invalid", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (cds_is_log_report_in_progress() == true) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: Bug report already in progress - dropping! type:%d, indicator=%d reason_code=%d",
 				__func__, is_fatal, indicator, reason_code);
 		return QDF_STATUS_E_FAILURE;
@@ -2001,18 +2001,18 @@ QDF_STATUS cds_flush_logs(uint32_t is_fatal,
 
 	status = cds_set_log_completion(is_fatal, indicator, reason_code);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"%s: Failed to set log trigger params", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 			"%s: Triggering bug report: type:%d, indicator=%d reason_code=%d",
 			__func__, is_fatal, indicator, reason_code);
 
 	ret = sme_send_flush_logs_cmd_to_fw(p_cds_context->pMACContext);
 	if (0 != ret) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				"%s: Failed to send flush FW log", __func__);
 		cds_init_log_completion();
 		return QDF_STATUS_E_FAILURE;
diff --git a/core/cds/src/cds_concurrency.c b/core/cds/src/cds_concurrency.c
index b8fbd6b3ed27..65d96ef2a918 100644
--- a/core/cds/src/cds_concurrency.c
+++ b/core/cds/src/cds_concurrency.c
@@ -44,7 +44,7 @@
 #include "wlan_hdd_hostapd.h"
 #include "cds_concurrency.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 
 #include <net/addrconf.h>
 #include <linux/wireless.h>
@@ -6292,7 +6292,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter,
 		 */
 		if (false == are_cc_channels_same) {
 			if (true == cds_is_sta_connection_pending()) {
-				MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+				MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 					TRACE_CODE_HDD_CLEAR_JOIN_REQ,
 					sta_adapter->sessionId, *roam_id));
 				ret = sme_clear_joinreq_param(
@@ -6305,7 +6305,7 @@ static bool cds_sta_p2pgo_concur_handle(hdd_adapter_t *sta_adapter,
 				cds_change_sta_conn_pending_status(false);
 				cds_info("===>Clear pending join req");
 			}
-			MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+			MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 					TRACE_CODE_HDD_STORE_JOIN_REQ,
 					sta_adapter->sessionId, *roam_id));
 			/* store the scan cache here */
diff --git a/core/cds/src/cds_mq.c b/core/cds/src/cds_mq.c
index e78fbec41da6..f622f395baf1 100644
--- a/core/cds/src/cds_mq.c
+++ b/core/cds/src/cds_mq.c
@@ -59,7 +59,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq)
 {
 
 	if (pMq == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -84,7 +84,7 @@ inline QDF_STATUS cds_mq_init(p_cds_mq_type pMq)
 inline void cds_mq_deinit(p_cds_mq_type pMq)
 {
 	if (pMq == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return;
 	}
@@ -104,7 +104,7 @@ inline void cds_mq_put(p_cds_mq_type pMq, p_cds_msg_wrapper pMsgWrapper)
 	unsigned long flags;
 
 	if ((pMq == NULL) || (pMsgWrapper == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return;
 	}
@@ -131,7 +131,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq)
 	unsigned long flags;
 
 	if (pMq == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return NULL;
 	}
@@ -139,7 +139,7 @@ inline p_cds_msg_wrapper cds_mq_get(p_cds_mq_type pMq)
 	spin_lock_irqsave(&pMq->mqLock, flags);
 
 	if (list_empty(&pMq->mqList)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_WARN,
 			  "%s: CDS Message Queue is empty", __func__);
 	} else {
 		listptr = pMq->mqList.next;
@@ -168,7 +168,7 @@ inline bool cds_is_mq_empty(p_cds_mq_type pMq)
 	unsigned long flags;
 
 	if (pMq == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -195,12 +195,12 @@ QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
 
 	cds_context = cds_get_global_context();
 	if (NULL == cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid cds_context", __func__);
 	} else {
 		hHal = cds_get_context(QDF_MODULE_ID_SME);
 		if (NULL == hHal) {
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 				  "%s: invalid hHal", __func__);
 		} else {
 			sirStatus = u_mac_post_ctrl_msg(hHal, pBuf);
diff --git a/core/cds/src/cds_packet.c b/core/cds/src/cds_packet.c
index c95cc3b83370..bd4764542870 100644
--- a/core/cds/src/cds_packet.c
+++ b/core/cds/src/cds_packet.c
@@ -41,7 +41,7 @@
 #include <cds_packet.h>
 #include <i_cds_packet.h>
 #include <qdf_mc_timer.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <wlan_hdd_main.h>
 #include "cdf_nbuf.h"
 #include "cdf_memory.h"
@@ -115,7 +115,7 @@ cds_pkt_get_packet_length(cds_pkt_t *pPacket, uint16_t *pPacketSize)
 	/* Validate the parameter pointers */
 	if (unlikely((pPacket == NULL) || (pPacketSize == NULL)) ||
 	    (pPacket->pkt_buf == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "VPKT [%d]: NULL pointer", __LINE__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -191,7 +191,7 @@ void cds_pkt_trace_buf_update(char *event_string)
 {
 	uint32_t slot;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s %d, %s", __func__, __LINE__, event_string);
 	qdf_spinlock_acquire(&trace_buffer_lock);
 	slot = trace_buffer_order % CDS_PKT_TRAC_MAX_TRACE_BUF;
@@ -218,14 +218,14 @@ void cds_pkt_trace_buf_dump(void)
 	uint32_t slot, idx;
 
 	qdf_spinlock_acquire(&trace_buffer_lock);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "PACKET TRACE DUMP START Current Timestamp %u",
 		  (unsigned int)qdf_mc_timer_get_system_time());
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "ORDER :        TIME : EVT");
 	if (CDS_PKT_TRAC_MAX_TRACE_BUF > trace_buffer_order) {
 		for (slot = 0; slot < trace_buffer_order; slot++) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%5d :%12u : %s",
 				  trace_buffer[slot].order,
 				  (unsigned int)trace_buffer[slot].event_time,
@@ -236,14 +236,14 @@ void cds_pkt_trace_buf_dump(void)
 			slot =
 				(trace_buffer_order +
 				 idx) % CDS_PKT_TRAC_MAX_TRACE_BUF;
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%5d :%12u : %s", trace_buffer[slot].order,
 				  (unsigned int)trace_buffer[slot].event_time,
 				  trace_buffer[slot].event_string);
 		}
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "PACKET TRACE DUMP END");
 	qdf_spinlock_release(&trace_buffer_lock);
 
@@ -275,7 +275,7 @@ void cds_pkt_proto_trace_init(void)
    ---------------------------------------------------------------------------*/
 void cds_pkt_proto_trace_close(void)
 {
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "%s %d", __func__, __LINE__);
 	cdf_mem_free(trace_buffer);
 	qdf_spinlock_destroy(&trace_buffer_lock);
diff --git a/core/cds/src/cds_reg_service.c b/core/cds/src/cds_reg_service.c
index 71879692ebd4..a2d3f7066e35 100644
--- a/core/cds/src/cds_reg_service.c
+++ b/core/cds/src/cds_reg_service.c
@@ -34,7 +34,7 @@
 #include <net/cfg80211.h>
 #include "qdf_types.h"
 #include "cds_reg_service.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "sme_api.h"
 #include "wlan_hdd_main.h"
 #include "cds_regdomain.h"
@@ -428,7 +428,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country)
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -437,7 +437,7 @@ QDF_STATUS cds_read_default_country(uint8_t *default_country)
 	       hdd_ctx->reg.def_country,
 	       CDS_COUNTRY_CODE_LEN + 1);
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "default country is %c%c\n",
 		  default_country[0],
 		  default_country[1]);
@@ -459,7 +459,7 @@ static enum channel_enum cds_get_channel_enum(uint32_t chan_num)
 		if (chan_mapping[loop].chan_num == chan_num)
 			return loop;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "invalid channel number %d", chan_num);
 
 	return INVALID_RF_CHANNEL;
@@ -669,7 +669,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 	struct wiphy *wiphy = NULL;
 
 	if (NULL == reg_domain_ptr) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("Invalid reg domain pointer"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -680,13 +680,13 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 		return QDF_STATUS_SUCCESS;
 
 	if (NULL == country_alpha2) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("Country code array is NULL"));
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "SSR in progress, return");
 		return QDF_STATUS_SUCCESS;
 	}
@@ -694,7 +694,7 @@ QDF_STATUS cds_get_reg_domain_from_country_code(v_REGDOMAIN_t *reg_domain_ptr,
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("Invalid pHddCtx pointer"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -753,7 +753,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -761,7 +761,7 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 	hdd_ctx->isVHT80Allowed = 0;
 
 	if (band_capability == eCSR_BAND_24)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 			  "band capability is set to 2G only");
 
 	for (i = 0, m = 0; i < IEEE80211_NUM_BANDS; i++) {
@@ -808,8 +808,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_DFS)) {
-						CDF_TRACE(QDF_MODULE_ID_QDF,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_QDF,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s: Remove passive scan restriction for %u",
 							  __func__,
 							  chan->center_freq);
@@ -819,8 +819,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_PASSIVE_SCAN)) {
-						CDF_TRACE(QDF_MODULE_ID_QDF,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_QDF,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s: Remove passive scan restriction for %u",
 							  __func__,
 							  chan->center_freq);
@@ -830,8 +830,8 @@ static int cds_process_regulatory_data(struct wiphy *wiphy,
 
 					if (!(reg_rule->flags &
 					      NL80211_RRF_NO_IBSS)) {
-						CDF_TRACE(QDF_MODULE_ID_QDF,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_QDF,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s: Remove no ibss restriction for %u",
 							  __func__,
 							  chan->center_freq);
@@ -972,7 +972,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 	bool vht80_allowed;
 	bool reset = false;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  FL("country: %c%c, initiator %d, dfs_region: %d"),
 		  request->alpha2[0],
 		  request->alpha2[1],
@@ -980,13 +980,13 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 		  request->dfs_region);
 
 	if (NULL == hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("Invalid pHddCtx pointer"));
 		return;
 	}
 
 	if (cds_is_driver_unloading() || cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Unloading or SSR in Progress, Ignore!!!",
 			  __func__);
 		return;
@@ -1055,7 +1055,7 @@ void __hdd_reg_notifier(struct wiphy *wiphy,
 		vht80_allowed = hdd_ctx->isVHT80Allowed;
 		if (cds_process_regulatory_data(wiphy, band_capability,
 						reset) == 0) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 				  (" regulatory entry created"));
 		}
 		if (hdd_ctx->isVHT80Allowed != vht80_allowed)
@@ -1107,7 +1107,7 @@ QDF_STATUS cds_regulatory_init(void)
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "invalid hdd_ctx pointer");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1121,7 +1121,7 @@ QDF_STATUS cds_regulatory_init(void)
 	if (cds_process_regulatory_data(wiphy,
 					hdd_ctx->config->
 					nBandCapability, true) != 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  ("Error while creating regulatory entry"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1154,7 +1154,7 @@ QDF_STATUS cds_regulatory_init(void)
 QDF_STATUS cds_set_reg_domain(void *client_ctxt, v_REGDOMAIN_t reg_domain)
 {
 	if (reg_domain >= REGDOMAIN_COUNT) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "CDS set reg domain, invalid REG domain ID %d",
 			  reg_domain);
 		return QDF_STATUS_E_INVAL;
@@ -1176,7 +1176,7 @@ void cds_set_ch_params(uint8_t ch, uint32_t phy_mode,
 {
 	tHalHandle *hal_ctx = cds_get_context(QDF_MODULE_ID_PE);
 	if (!hal_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			("Invalid hal_ctx pointer"));
 		return;
 	}
diff --git a/core/cds/src/cds_sched.c b/core/cds/src/cds_sched.c
index 9b331b3e7427..bf65868a0d26 100644
--- a/core/cds/src/cds_sched.c
+++ b/core/cds/src/cds_sched.c
@@ -124,7 +124,7 @@ cds_cpu_hotplug_notify(struct notifier_block *block,
 		return NOTIFY_OK;
 
 	num_cpus = num_possible_cpus();
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%s: RX CORE %d, STATE %d, NUM CPUS %d",
 		  __func__, (int)affine_cpu, (int)state, num_cpus);
 	multi_cluster = (num_cpus > CDS_CORE_PER_CLUSTER) ? 1 : 0;
@@ -191,16 +191,16 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 		uint32_t SchedCtxSize)
 {
 	QDF_STATUS vStatus = QDF_STATUS_SUCCESS;
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening the CDS Scheduler", __func__);
 	/* Sanity checks */
 	if ((p_cds_context == NULL) || (pSchedContext == NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (sizeof(cds_sched_context) != SchedCtxSize) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Incorrect CDS Sched Context size passed",
 			  __func__);
 		return QDF_STATUS_E_INVAL;
@@ -209,7 +209,7 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	pSchedContext->pVContext = p_cds_context;
 	vStatus = cds_sched_init_mqs(pSchedContext);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to initialize CDS Scheduler MQs",
 			  __func__);
 		return vStatus;
@@ -252,13 +252,13 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	pSchedContext->McThread = kthread_create(cds_mc_thread, pSchedContext,
 						 "cds_mc_thread");
 	if (IS_ERR(pSchedContext->McThread)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Could not Create CDS Main Thread Controller",
 			  __func__);
 		goto MC_THREAD_START_FAILURE;
 	}
 	wake_up_process(pSchedContext->McThread);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS Main Controller thread Created", __func__);
 
 #ifdef QCA_CONFIG_SMP
@@ -267,14 +267,14 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 						       "cds_ol_rx_thread");
 	if (IS_ERR(pSchedContext->ol_rx_thread)) {
 
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Could not Create CDS OL RX Thread",
 			  __func__);
 		goto OL_RX_THREAD_START_FAILURE;
 
 	}
 	wake_up_process(pSchedContext->ol_rx_thread);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  ("CDS OL RX thread Created"));
 #endif
 	/*
@@ -282,15 +282,15 @@ QDF_STATUS cds_sched_open(void *p_cds_context,
 	 * Each thread should normally ACK back when it starts.
 	 */
 	wait_for_completion_interruptible(&pSchedContext->McStartEvent);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS MC Thread has started", __func__);
 #ifdef QCA_CONFIG_SMP
 	wait_for_completion_interruptible(&pSchedContext->ol_rx_start_event);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS OL Rx Thread has started", __func__);
 #endif
 	/* We're good now: Let's get the ball rolling!!! */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: CDS Scheduler successfully Opened", __func__);
 	return QDF_STATUS_SUCCESS;
 
@@ -336,7 +336,7 @@ static int cds_mc_thread(void *Arg)
 	v_CONTEXT_t p_cds_context = NULL;
 
 	if (Arg == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Bad Args passed", __func__);
 		return 0;
 	}
@@ -346,21 +346,21 @@ static int cds_mc_thread(void *Arg)
 	 * has been created
 	 */
 	complete(&pSchedContext->McStartEvent);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: MC Thread %d (%s) starting up", __func__, current->pid,
 		  current->comm);
 
 	/* Get the Global CDS Context */
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Global CDS context is Null", __func__);
 		return 0;
 	}
 
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: HDD context is Null", __func__);
 		return 0;
 	}
@@ -375,10 +375,10 @@ static int cds_mc_thread(void *Arg)
 							     &pSchedContext->mcEventFlag));
 
 		if (retWaitStatus == -ERESTARTSYS) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: wait_event_interruptible returned -ERESTARTSYS",
 				  __func__);
-			CDF_BUG(0);
+			QDF_BUG(0);
 		}
 		clear_bit(MC_POST_EVENT_MASK, &pSchedContext->mcEventFlag);
 
@@ -387,8 +387,8 @@ static int cds_mc_thread(void *Arg)
 			if (test_bit
 				    (MC_SHUTDOWN_EVENT_MASK,
 				    &pSchedContext->mcEventFlag)) {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: MC thread signaled to shutdown",
 					  __func__);
 				shutdown = true;
@@ -407,26 +407,26 @@ static int cds_mc_thread(void *Arg)
 			/* Check the SYS queue first */
 			if (!cds_is_mq_empty(&pSchedContext->sysMcMq)) {
 				/* Service the SYS message queue */
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS SYS MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->sysMcMq);
 				if (pMsgWrapper == NULL) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					break;
 				}
 				vStatus =
 					sys_mc_process_msg(pSchedContext->pVContext,
 							   pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing SYS message",
 						  __func__);
 				}
@@ -438,26 +438,26 @@ static int cds_mc_thread(void *Arg)
 			/* Check the WMA queue */
 			if (!cds_is_mq_empty(&pSchedContext->wmaMcMq)) {
 				/* Service the WMA message queue */
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS WMA MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->wmaMcMq);
 				if (pMsgWrapper == NULL) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					break;
 				}
 				vStatus =
 					wma_mc_process_msg(pSchedContext->pVContext,
 							 pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing WMA message",
 						  __func__);
 				}
@@ -469,18 +469,18 @@ static int cds_mc_thread(void *Arg)
 			/* Check the PE queue */
 			if (!cds_is_mq_empty(&pSchedContext->peMcMq)) {
 				/* Service the PE message queue */
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS PE MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->peMcMq);
 				if (NULL == pMsgWrapper) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					break;
 				}
 
@@ -488,8 +488,8 @@ static int cds_mc_thread(void *Arg)
 				pMacContext =
 					cds_get_context(QDF_MODULE_ID_PE);
 				if (NULL == pMacContext) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_INFO,
 						  "MAC Context not ready yet");
 					cds_core_return_msg
 						(pSchedContext->pVContext,
@@ -502,8 +502,8 @@ static int cds_mc_thread(void *Arg)
 							    (tSirMsgQ *)
 							    pMsgWrapper->pVosMsg);
 				if (eSIR_SUCCESS != macStatus) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing PE message",
 						  __func__);
 				}
@@ -515,18 +515,18 @@ static int cds_mc_thread(void *Arg)
 			/** Check the SME queue **/
 			if (!cds_is_mq_empty(&pSchedContext->smeMcMq)) {
 				/* Service the SME message queue */
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Servicing the CDS SME MC Message queue",
 					  __func__);
 				pMsgWrapper =
 					cds_mq_get(&pSchedContext->smeMcMq);
 				if (NULL == pMsgWrapper) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: pMsgWrapper is NULL",
 						  __func__);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					break;
 				}
 
@@ -534,8 +534,8 @@ static int cds_mc_thread(void *Arg)
 				pMacContext =
 					cds_get_context(QDF_MODULE_ID_SME);
 				if (NULL == pMacContext) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_INFO,
 						  "MAC Context not ready yet");
 					cds_core_return_msg
 						(pSchedContext->pVContext,
@@ -547,8 +547,8 @@ static int cds_mc_thread(void *Arg)
 					sme_process_msg((tHalHandle) pMacContext,
 							pMsgWrapper->pVosMsg);
 				if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-					CDF_TRACE(QDF_MODULE_ID_QDF,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_QDF,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Issue Processing SME message",
 						  __func__);
 				}
@@ -579,7 +579,7 @@ static int cds_mc_thread(void *Arg)
 		} /* while message loop processing */
 	} /* while true */
 	/* If we get here the MC thread must exit */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: MC Thread exiting!!!!", __func__);
 	complete_and_exit(&pSchedContext->McShutdown, 0);
 } /* cds_mc_thread() */
@@ -627,7 +627,7 @@ static QDF_STATUS cds_alloc_ol_rx_pkt_freeq(p_cds_sched_context pSchedContext)
 	for (i = 0; i < CDS_MAX_OL_RX_PKT; i++) {
 		pkt = cdf_mem_malloc(sizeof(*pkt));
 		if (!pkt) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s Vos packet allocation for ol rx thread failed",
 				  __func__);
 			goto free;
@@ -822,7 +822,7 @@ static int cds_ol_rx_thread(void *arg)
 		affine_cpu = pref_cpu;
 
 	if (!arg) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Bad Args passed", __func__);
 		return 0;
 	}
@@ -852,8 +852,8 @@ static int cds_ol_rx_thread(void *arg)
 					complete
 						(&pSchedContext->ol_suspend_rx_event);
 				}
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Shutting down OL RX Thread",
 					  __func__);
 				shutdown = true;
@@ -877,7 +877,7 @@ static int cds_ol_rx_thread(void *arg)
 		}
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "%s: Exiting CDS OL rx thread", __func__);
 	complete_and_exit(&pSchedContext->ol_rx_shutdown, 0);
 }
@@ -897,10 +897,10 @@ static int cds_ol_rx_thread(void *arg)
  */
 QDF_STATUS cds_sched_close(void *p_cds_context)
 {
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: invoked", __func__);
 	if (gp_cds_sched_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_sched_context == NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -944,40 +944,40 @@ QDF_STATUS cds_sched_init_mqs(p_cds_sched_context pSchedContext)
 {
 	QDF_STATUS vStatus = QDF_STATUS_SUCCESS;
 	/* Now intialize all the message queues */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the WMA MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->wmaMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init WMA MC Message queue", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the PE MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->peMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init PE MC Message queue", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the SME MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->smeMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init SME MC Message queue", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return vStatus;
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing the SYS MC Message queue", __func__);
 	vStatus = cds_mq_init(&pSchedContext->sysMcMq);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init SYS MC Message queue", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return vStatus;
 	}
 
@@ -995,19 +995,19 @@ void cds_sched_deinit_mqs(p_cds_sched_context pSchedContext)
 	/* Now de-intialize all message queues */
 
 	/* MC WMA */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the WMA MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->wmaMcMq);
 	/* MC PE */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the PE MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->peMcMq);
 	/* MC SME */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the SME MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->smeMcMq);
 	/* MC SYS */
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s De-Initializing the SYS MC Message queue", __func__);
 	cds_mq_deinit(&pSchedContext->sysMcMq);
 
@@ -1028,27 +1028,27 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	 * Core. Before returning a wrapper to the Core, the CDS message shall
 	 * be freed first
 	 */
-	CDF_TRACE(QDF_MODULE_ID_QDF,
-		  CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF,
+		  QDF_TRACE_LEVEL_INFO,
 		  ("Flushing the MC Thread message queue"));
 
 	if (NULL == pSchedContext) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pSchedContext is NULL", __func__);
 		return;
 	}
 
 	cds_ctx = (p_cds_contextType) (pSchedContext->pVContext);
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: cds_ctx is NULL", __func__);
 		return;
 	}
 
 	/* Flush the SYS Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->sysMcMq))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF,
-			  CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF,
+			  QDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC SYS message type %d ", __func__,
 			  pMsgWrapper->pVosMsg->type);
 		cds_core_return_msg(pSchedContext->pVContext, pMsgWrapper);
@@ -1056,7 +1056,7 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	/* Flush the WMA Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->wmaMcMq))) {
 		if (pMsgWrapper->pVosMsg != NULL) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 				  "%s: Freeing MC WMA MSG message type %d",
 				  __func__, pMsgWrapper->pVosMsg->type);
 			if (pMsgWrapper->pVosMsg->bodyptr) {
@@ -1073,8 +1073,8 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 
 	/* Flush the PE Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->peMcMq))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF,
-			  CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF,
+			  QDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC PE MSG message type %d", __func__,
 			  pMsgWrapper->pVosMsg->type);
 		pe_free_msg(cds_ctx->pMACContext,
@@ -1083,8 +1083,8 @@ void cds_sched_flush_mc_mqs(p_cds_sched_context pSchedContext)
 	}
 	/* Flush the SME Mq */
 	while (NULL != (pMsgWrapper = cds_mq_get(&pSchedContext->smeMcMq))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF,
-			  CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF,
+			  QDF_TRACE_LEVEL_INFO,
 			  "%s: Freeing MC SME MSG message type %d", __func__,
 			  pMsgWrapper->pVosMsg->type);
 		sme_free_msg(cds_ctx->pMACContext, pMsgWrapper->pVosMsg);
@@ -1101,7 +1101,7 @@ p_cds_sched_context get_cds_sched_ctxt(void)
 {
 	/* Make sure that Vos Scheduler context has been initialized */
 	if (gp_cds_sched_context == NULL)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: gp_cds_sched_context == NULL", __func__);
 
 	return gp_cds_sched_context;
@@ -1143,7 +1143,7 @@ static void cds_print_external_threads(void)
 
 	while (i < MAX_SSR_PROTECT_LOG) {
 		if (!ssr_protect_log[i].free) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"PID %d is stuck at %s", ssr_protect_log[i].pid,
 			ssr_protect_log[i].func);
 		}
@@ -1186,7 +1186,7 @@ void cds_ssr_protect(const char *caller_func)
 	spin_unlock_irqrestore(&ssr_protect_lock, irq_flags);
 
 	if (!status)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		"Could not track PID %d call %s: log is full",
 		current->pid, caller_func);
 }
@@ -1225,7 +1225,7 @@ void cds_ssr_unprotect(const char *caller_func)
 	spin_unlock_irqrestore(&ssr_protect_lock, irq_flags);
 
 	if (!status)
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"Untracked call %s", caller_func);
 }
 
@@ -1247,7 +1247,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func)
 			break;
 
 		if (--count) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Waiting for active entry points to exit",
 				  __func__);
 			msleep(SSR_WAIT_SLEEP_TIME);
@@ -1259,7 +1259,7 @@ bool cds_wait_for_external_threads_completion(const char *caller_func)
 		return false;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 		  "Allowing SSR/Driver unload for %s", caller_func);
 
 	return true;
diff --git a/core/cds/src/cds_utils.c b/core/cds/src/cds_utils.c
index 2b232e37d6e0..a68c0d276371 100644
--- a/core/cds/src/cds_utils.c
+++ b/core/cds/src/cds_utils.c
@@ -49,7 +49,7 @@
  * Include Files
  * -------------------------------------------------------------------------*/
 
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_utils.h"
 #include "cdf_memory.h"
 #include "cds_crypto.h"
@@ -358,7 +358,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 
 	/* Check if frame is invalid length */
 	if (((efrm - frm) != frmLen) || (frmLen < sizeof(*wh))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid frame length", __func__);
 		return false;
 	}
@@ -388,14 +388,14 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	if (IS_ERR(tfm)) {
 		ret = PTR_ERR(tfm);
 		tfm = NULL;
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: crypto_alloc_cipher failed (%d)", __func__, ret);
 		goto err_tfm;
 	}
 
 	ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: crypto_cipher_setkey failed (%d)", __func__,
 			  ret);
 		goto err_tfm;
@@ -418,7 +418,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	nBytes = AAD_LEN + (frmLen - sizeof(struct ieee80211_frame));
 	input = (uint8_t *) cdf_mem_malloc(nBytes);
 	if (NULL == input) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Memory allocation failed", __func__);
 		ret = QDF_STATUS_E_NOMEM;
 		goto err_tfm;
@@ -439,7 +439,7 @@ cds_attach_mmie(uint8_t *igtk, uint8_t *ipn, uint16_t key_id,
 	cds_cmac_calc_mic(tfm, input, nBytes, mic);
 	cdf_mem_free(input);
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X",
 		  mic[0], mic[1], mic[2], mic[3],
 		  mic[4], mic[5], mic[6], mic[7]);
@@ -467,7 +467,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 
 	/* Check if frame is invalid length */
 	if ((efrm < frm) || ((efrm - frm) < sizeof(*wh))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid frame length");
 		return false;
 	}
@@ -477,7 +477,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	/* Check Element ID */
 	if ((mmie->element_id != IEEE80211_ELEMID_MMIE) ||
 	    (mmie->length != (sizeof(*mmie) - 2))) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "IE is not Mgmt MIC IE or Invalid length");
 		/* IE is not Mgmt MIC IE or invalid length */
 		return false;
@@ -487,7 +487,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	rx_ipn = mmie->sequence_number;
 	if (OS_MEMCMP(rx_ipn, ipn, CMAC_IPN_LEN) <= 0) {
 		/* Replay error */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Replay error mmie ipn %02X %02X %02X %02X %02X %02X"
 			  " drvr ipn %02X %02X %02X %02X %02X %02X",
 			  rx_ipn[0], rx_ipn[1], rx_ipn[2], rx_ipn[3], rx_ipn[4],
@@ -499,14 +499,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	if (IS_ERR(tfm)) {
 		ret = PTR_ERR(tfm);
 		tfm = NULL;
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_cipher failed (%d)", ret);
 		goto err_tfm;
 	}
 
 	ret = crypto_cipher_setkey(tfm, igtk, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed (%d)", ret);
 		goto err_tfm;
 	}
@@ -528,7 +528,7 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	nBytes = AAD_LEN + (efrm - (uint8_t *) (wh + 1));
 	input = (uint8_t *) cdf_mem_malloc(nBytes);
 	if (NULL == input) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Memory allocation failed");
 		ret = QDF_STATUS_E_NOMEM;
 		goto err_tfm;
@@ -543,14 +543,14 @@ cds_is_mmie_valid(uint8_t *igtk, uint8_t *ipn, uint8_t *frm, uint8_t *efrm)
 	cds_cmac_calc_mic(tfm, input, nBytes, mic);
 	cdf_mem_free(input);
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 		  "CMAC(T)= %02X %02X %02X %02X %02X %02X %02X %02X",
 		  mic[0], mic[1], mic[2], mic[3],
 		  mic[4], mic[5], mic[6], mic[7]);
 
 	if (OS_MEMCMP(mic, mmie->mic, CMAC_TLEN) != 0) {
 		/* MMIE MIC mismatch */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "BC/MC MGMT frame MMIE MIC check Failed"
 			  " rmic %02X %02X %02X %02X %02X %02X %02X %02X"
 			  " cmic %02X %02X %02X %02X %02X %02X %02X %02X",
@@ -630,7 +630,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	tfm = cds_crypto_alloc_ahash("hmac(sha1)", CRYPTO_ALG_TYPE_AHASH,
 				 CRYPTO_ALG_TYPE_AHASH_MASK);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ahash failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -638,7 +638,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	req = ahash_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "failed to allocate request for hmac(sha1)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -649,7 +649,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	hash_buff = kzalloc(psize, GFP_KERNEL);
 	if (!hash_buff) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "failed to kzalloc hash_buff");
 		ret = -ENOMEM;
 		goto err_hash_buf;
@@ -663,7 +663,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 		crypto_ahash_clear_flags(tfm, ~0);
 		ret = cds_crypto_ahash_setkey(tfm, key, ksize);
 		if (ret) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "crypto_ahash_setkey failed");
 			goto err_setkey;
 		}
@@ -671,7 +671,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	ahash_request_set_crypt(req, &sg, hash_result, psize);
 	ret = cds_crypto_ahash_digest(req);
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
 
 	switch (ret) {
 	case 0:
@@ -687,7 +687,7 @@ hmac_sha1(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 			INIT_COMPLETION(tresult.completion);
 			break;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "wait_for_completion_interruptible failed");
 			if (!ret)
 				ret = tresult.err;
@@ -726,7 +726,7 @@ QDF_STATUS cds_sha1_hmac_str(uint32_t cryptHandle,      /* Handle */
 			);
 
 	if (ret != 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "hmac_sha1() call failed");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -791,7 +791,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	tfm = cds_crypto_alloc_ahash("hmac(md5)", CRYPTO_ALG_TYPE_AHASH,
 				 CRYPTO_ALG_TYPE_AHASH_MASK);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ahash failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -799,7 +799,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	req = ahash_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "failed to allocate request for hmac(md5)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -810,7 +810,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 
 	hash_buff = kzalloc(psize, GFP_KERNEL);
 	if (!hash_buff) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "failed to kzalloc hash_buff");
 		ret = -ENOMEM;
 		goto err_hash_buf;
@@ -824,7 +824,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 		crypto_ahash_clear_flags(tfm, ~0);
 		ret = cds_crypto_ahash_setkey(tfm, key, ksize);
 		if (ret) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "crypto_ahash_setkey failed");
 			goto err_setkey;
 		}
@@ -833,7 +833,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 	ahash_request_set_crypt(req, &sg, hash_result, psize);
 	ret = cds_crypto_ahash_digest(req);
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, "ret 0x%x", ret);
 
 	switch (ret) {
 	case 0:
@@ -847,7 +847,7 @@ hmac_md5(uint8_t *key, uint8_t ksize, char *plaintext, uint8_t psize,
 			INIT_COMPLETION(tresult.completion);
 			break;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "wait_for_completion_interruptible failed");
 			if (!ret)
 				ret = tresult.err;
@@ -886,7 +886,7 @@ QDF_STATUS cds_md5_hmac_str(uint32_t cryptHandle,       /* Handle */
 		       );
 
 	if (ret != 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "hmac_md5() call failed");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -951,7 +951,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ablkcipher failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -959,7 +959,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate request for cbc(aes)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -972,7 +972,7 @@ QDF_STATUS cds_encrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed");
 		goto err_setkey;
 	}
@@ -995,7 +995,7 @@ err_req:
 err_tfm:
 	/* return ret; */
 	if (ret != 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s() call failed", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1047,7 +1047,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	tfm = cds_crypto_alloc_ablkcipher("cbc(aes)", 0, 0);
 	if (IS_ERR(tfm)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_alloc_ablkcipher failed");
 		ret = PTR_ERR(tfm);
 		goto err_tfm;
@@ -1055,7 +1055,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	req = ablkcipher_request_alloc(tfm, GFP_KERNEL);
 	if (!req) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate request for cbc(aes)");
 		ret = -ENOMEM;
 		goto err_req;
@@ -1068,7 +1068,7 @@ QDF_STATUS cds_decrypt_aes(uint32_t cryptHandle,        /* Handle */
 
 	ret = crypto_ablkcipher_setkey(tfm, pKey, AES_KEYSIZE_128);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "crypto_cipher_setkey failed");
 		goto err_setkey;
 	}
@@ -1091,7 +1091,7 @@ err_req:
 err_tfm:
 	/* return ret; */
 	if (ret != 0) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s() call failed", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
diff --git a/core/dp/htt/htt_internal.h b/core/dp/htt/htt_internal.h
index 4e3b91a6e4c6..5055a6c8212f 100644
--- a/core/dp/htt/htt_internal.h
+++ b/core/dp/htt/htt_internal.h
@@ -537,7 +537,7 @@ void htt_rx_dbg_rxbuf_init(struct htt_pdev_t *pdev)
 				 sizeof(struct rx_buf_debug));
 	if (!pdev->rx_buff_list) {
 		qdf_print("HTT: debug RX buffer allocation failed\n");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 }
 /**
diff --git a/core/dp/htt/htt_tx.c b/core/dp/htt/htt_tx.c
index 13f1de7cefe0..04bba5d686e4 100644
--- a/core/dp/htt/htt_tx.c
+++ b/core/dp/htt/htt_tx.c
@@ -606,7 +606,7 @@ int htt_tx_send_std(htt_pdev_handle pdev, cdf_nbuf_t msdu, uint16_t msdu_id)
 	}
 
 	NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT);
-	DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
+	DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
 				(uint8_t *)(cdf_nbuf_data(msdu)),
 				sizeof(cdf_nbuf_data(msdu))));
 	if (cdf_nbuf_queue_len(&pdev->txnbufq) > 0) {
@@ -748,7 +748,7 @@ htt_tx_send_base(htt_pdev_handle pdev,
 
 	cdf_nbuf_trace_update(msdu, "HT:T:");
 	NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_HTT);
-	DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
+	DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_HTT_PACKET_PTR_RECORD,
 				(uint8_t *)(cdf_nbuf_data(msdu)),
 				sizeof(cdf_nbuf_data(msdu))));
 	htc_send_data_pkt(pdev->htc_pdev, &pkt->htc_pkt, more_data);
diff --git a/core/dp/ol/inc/ol_htt_tx_api.h b/core/dp/ol/inc/ol_htt_tx_api.h
index ab27b2ca895b..9fd32f61d989 100644
--- a/core/dp/ol/inc/ol_htt_tx_api.h
+++ b/core/dp/ol/inc/ol_htt_tx_api.h
@@ -46,7 +46,7 @@
 #include <qdf_net_types.h>
 #include <ol_htt_api.h>         /* htt_pdev_handle */
 #include <htt_types.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 
 /* Remove these macros when they get added to htt.h. */
 #ifndef HTT_TX_DESC_EXTENSION_GET
@@ -287,35 +287,35 @@ struct htt_msdu_info_t {
 
 static inline void htt_msdu_info_dump(struct htt_msdu_info_t *msdu_info)
 {
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "HTT MSDU info object (%p)\n", msdu_info);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  ethertype: %#x\n", msdu_info->info.ethertype);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  peer_id: %d\n", msdu_info->info.peer_id);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  vdev_id: %d\n", msdu_info->info.vdev_id);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  ext_tid: %d\n", msdu_info->info.ext_tid);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  l2_hdr_type: %d\n", msdu_info->info.l2_hdr_type);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  frame_type: %d\n", msdu_info->info.frame_type);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  frame_subtype: %d\n", msdu_info->info.frame_subtype);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  l3_hdr_offset: %u\n", msdu_info->info.l3_hdr_offset);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  use 6 Mbps: %d\n", msdu_info->action.use_6mbps);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  do_encrypt: %d\n", msdu_info->action.do_encrypt);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  do_tx_complete: %d\n", msdu_info->action.do_tx_complete);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "  is_unicast: %u\n", msdu_info->info.is_unicast);
 }
 
@@ -573,7 +573,7 @@ htt_tx_desc_init(htt_pdev_handle pdev,
 
 		ce_pkt_type = htt_to_ce_pkt_type[pkt_type];
 		if (0xffffffff == ce_pkt_type) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
 			"Invalid HTT pkt type %d\n", pkt_type);
 			return;
 		}
@@ -844,7 +844,7 @@ htt_tx_desc_frag(htt_pdev_handle pdev,
 		*word32 |= (frag_len << 16);
 	} else {
 		/* For Helium+, this block cannot exist */
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 #else /* !defined(HELIUMPLUS_PADDR64) */
 	{
diff --git a/core/dp/txrx/ol_rx.c b/core/dp/txrx/ol_rx.c
index 3b02e827e0dd..5b86ca97c49b 100644
--- a/core/dp/txrx/ol_rx.c
+++ b/core/dp/txrx/ol_rx.c
@@ -75,10 +75,10 @@ void ol_rx_data_process(struct ol_txrx_peer_t *peer,
 
 static void ol_rx_restore_handler(struct work_struct *htt_rx)
 {
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "Enter: %s", __func__);
 	cnss_device_self_recovery();
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "Exit: %s", __func__);
 }
 
@@ -91,7 +91,7 @@ void ol_rx_trigger_restore(htt_pdev_handle htt_pdev, cdf_nbuf_t head_msdu,
 
 	while (head_msdu) {
 		next = cdf_nbuf_next(head_msdu);
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 			  "freeing %p\n", head_msdu);
 		cdf_nbuf_free(head_msdu);
 		head_msdu = next;
diff --git a/core/dp/txrx/ol_rx_defrag.c b/core/dp/txrx/ol_rx_defrag.c
index 78e0ad003db6..8c05c6098a0e 100644
--- a/core/dp/txrx/ol_rx_defrag.c
+++ b/core/dp/txrx/ol_rx_defrag.c
@@ -403,7 +403,7 @@ void ol_rx_defrag_waitlist_remove(struct ol_txrx_peer_t *peer, unsigned tid)
 	} else if (rx_reorder->defrag_waitlist_elem.tqe_next != NULL) {
 		TXRX_PRINT(TXRX_PRINT_LEVEL_FATAL_ERR,
 				"waitlist->tqe_prv = NULL\n");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		rx_reorder->defrag_waitlist_elem.tqe_next = NULL;
 	}
 }
diff --git a/core/dp/txrx/ol_rx_pn.c b/core/dp/txrx/ol_rx_pn.c
index 05b59f24a7f5..1d5a4acbc88e 100644
--- a/core/dp/txrx/ol_rx_pn.c
+++ b/core/dp/txrx/ol_rx_pn.c
@@ -329,12 +329,12 @@ void ol_rx_pn_trace_display(ol_txrx_pdev_handle pdev, int just_once)
 	}
 
 	i = start;
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "                                 seq     PN");
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "   count  idx    peer   tid uni  num    LSBs");
 	do {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 			  "  %6lld %4d  %p %2d   %d %4d %8d",
 			  cnt, i,
 			  pdev->rx_pn_trace.data[i].peer,
diff --git a/core/dp/txrx/ol_rx_reorder.c b/core/dp/txrx/ol_rx_reorder.c
index 81694d2113b3..7c3a8171d0b3 100644
--- a/core/dp/txrx/ol_rx_reorder.c
+++ b/core/dp/txrx/ol_rx_reorder.c
@@ -798,22 +798,22 @@ ol_rx_reorder_trace_display(ol_txrx_pdev_handle pdev, int just_once, int limit)
 	}
 
 	i = start;
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "           log       array seq");
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "   count   idx  tid   idx  num (LSBs)");
 	do {
 		uint16_t seq_num, reorder_idx;
 		seq_num = pdev->rx_reorder_trace.data[i].seq_num;
 		reorder_idx = pdev->rx_reorder_trace.data[i].reorder_idx;
 		if (seq_num < (1 << 14)) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 				  "  %6lld  %4d  %3d  %4d  %4d (%d)",
 				  cnt, i, pdev->rx_reorder_trace.data[i].tid,
 				  reorder_idx, seq_num, seq_num & 63);
 		} else {
 			int err = TXRX_SEQ_NUM_ERR(seq_num);
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 				  "  %6lld  %4d err %d (%d MPDUs)",
 				  cnt, i, err,
 				  pdev->rx_reorder_trace.data[i].num_mpdus);
diff --git a/core/dp/txrx/ol_tx.c b/core/dp/txrx/ol_tx.c
index c8b227ab0b99..decec2339d41 100644
--- a/core/dp/txrx/ol_tx.c
+++ b/core/dp/txrx/ol_tx.c
@@ -152,7 +152,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 	QDF_STATUS status;
 
 	if (qdf_unlikely(!pdev)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s:pdev is null", __func__);
 		return skb;
 	}
@@ -163,27 +163,27 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 	}
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s:Invalid sta id", __func__);
 		return skb;
 	}
 
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 	if (!peer) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s:Invalid peer", __func__);
 		return skb;
 	}
 
 	if (peer->state < ol_txrx_peer_state_conn) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s: station to be yet registered..dropping pkt", __func__);
 		return skb;
 	}
 
 	status = cdf_nbuf_map_single(cdf_ctx, skb, QDF_DMA_TO_DEVICE);
 	if (qdf_unlikely(status != QDF_STATUS_SUCCESS)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s: nbuf map failed", __func__);
 		return skb;
 	}
@@ -199,7 +199,7 @@ cdf_nbuf_t ol_tx_send_data_frame(uint8_t sta_id, cdf_nbuf_t skb,
 	cdf_nbuf_set_next(skb, NULL);
 	ret = OL_TX_LL(peer->vdev, skb);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_WARN,
 			"%s: Failed to tx", __func__);
 		cdf_nbuf_unmap_single(cdf_ctx, ret, QDF_DMA_TO_DEVICE);
 		return ret;
@@ -826,8 +826,8 @@ ol_tx_vdev_pause_queue_append(struct ol_txrx_vdev_t *vdev,
 	       vdev->ll_pause.txq.depth < vdev->ll_pause.max_q_depth) {
 		cdf_nbuf_t next = cdf_nbuf_next(msdu_list);
 		NBUF_UPDATE_TX_PKT_COUNT(msdu_list, NBUF_TX_PKT_TXRX_ENQUEUE);
-		DPTRACE(cdf_dp_trace(msdu_list,
-				CDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD,
+		DPTRACE(qdf_dp_trace(msdu_list,
+				QDF_DP_TRACE_TXRX_QUEUE_PACKET_PTR_RECORD,
 				(uint8_t *)(cdf_nbuf_data(msdu_list)),
 				sizeof(cdf_nbuf_data(msdu_list))));
 
diff --git a/core/dp/txrx/ol_tx_queue.c b/core/dp/txrx/ol_tx_queue.c
index d846a6b504e1..99f3584964f2 100644
--- a/core/dp/txrx/ol_tx_queue.c
+++ b/core/dp/txrx/ol_tx_queue.c
@@ -55,7 +55,7 @@ void ol_txrx_vdev_pause(ol_txrx_vdev_handle vdev, uint32_t reason)
 	vdev->ll_pause.is_q_paused = true;
 	qdf_spin_unlock_bh(&vdev->ll_pause.mutex);
 
-	DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_PAUSE,
+	DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_VDEV_PAUSE,
 				NULL, 0));
 	TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__);
 }
@@ -80,7 +80,7 @@ void ol_txrx_vdev_unpause(ol_txrx_vdev_handle vdev, uint32_t reason)
 	} else {
 		qdf_spin_unlock_bh(&vdev->ll_pause.mutex);
 	}
-	DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_VDEV_UNPAUSE,
+	DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_VDEV_UNPAUSE,
 				NULL, 0));
 	TX_SCHED_DEBUG_PRINT("Leave %s\n", __func__);
 }
diff --git a/core/dp/txrx/ol_tx_send.c b/core/dp/txrx/ol_tx_send.c
index 18e4b36603ec..918917a5ae22 100644
--- a/core/dp/txrx/ol_tx_send.c
+++ b/core/dp/txrx/ol_tx_send.c
@@ -183,7 +183,7 @@ ol_tx_send(struct ol_txrx_pdev_t *pdev,
 	msdu_credit_consumed = ol_tx_send_base(pdev, tx_desc, msdu);
 	id = ol_tx_desc_id(pdev, tx_desc);
 	NBUF_UPDATE_TX_PKT_COUNT(msdu, NBUF_TX_PKT_TXRX);
-	DPTRACE(cdf_dp_trace(msdu, CDF_DP_TRACE_TXRX_PACKET_PTR_RECORD,
+	DPTRACE(qdf_dp_trace(msdu, QDF_DP_TRACE_TXRX_PACKET_PTR_RECORD,
 				(uint8_t *)(cdf_nbuf_data(msdu)),
 				sizeof(cdf_nbuf_data(msdu))));
 	failed = htt_tx_send_std(pdev->htt_pdev, msdu, id);
@@ -776,7 +776,7 @@ static inline uint8_t *ol_tx_dest_addr_find(struct ol_txrx_pdev_t *pdev,
 	} else if (pdev->frame_format == wlan_frm_fmt_802_3) {
 		hdr_ptr = datap;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid standard frame type: %d",
 			  pdev->frame_format);
 		qdf_assert(0);
diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 9f88de09f850..e8646c8c7331 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -133,7 +133,7 @@ ol_txrx_find_peer_by_addr_and_vdev(ol_txrx_pdev_handle pdev,
 QDF_STATUS ol_txrx_get_vdevid(struct ol_txrx_peer_t *peer, uint8_t *vdev_id)
 {
 	if (!peer) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				  "peer argument is null!!");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -148,21 +148,21 @@ void *ol_txrx_get_vdev_by_sta_id(uint8_t sta_id)
 	ol_txrx_pdev_handle pdev = NULL;
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid sta id passed");
 		return NULL;
 	}
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			      "PDEV not found for sta_id [%d]", sta_id);
 		return NULL;
 	}
 
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 	if (!peer) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			      "PEER [%d] not found", sta_id);
 		return NULL;
 	}
@@ -555,7 +555,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		pdev->tx_desc.desc_reserved_size, desc_pool_size, 0, true);
 	if ((0 == pdev->tx_desc.desc_pages.num_pages) ||
 		(NULL == pdev->tx_desc.desc_pages.cacheable_pages)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"Page alloc fail");
 		goto page_alloc_fail;
 	}
@@ -568,7 +568,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		desc_per_page = desc_per_page >> 1;
 	}
 	pdev->tx_desc.page_divider = (sig_bit - 1);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		"page_divider 0x%x, offset_filter 0x%x num elem %d, ol desc num page %d, ol desc per page %d",
 		pdev->tx_desc.page_divider, pdev->tx_desc.offset_filter,
 		desc_pool_size, pdev->tx_desc.desc_pages.num_pages,
@@ -599,7 +599,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 
 		htt_tx_desc = htt_tx_desc_alloc(pdev->htt_pdev, &paddr, i);
 		if (!htt_tx_desc) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
 				  "%s: failed to alloc HTT tx desc (%d of %d)",
 				__func__, i, desc_pool_size);
 			fail_idx = i;
@@ -611,7 +611,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		ret = htt_tx_frag_alloc(pdev->htt_pdev,
 					i, &frag_paddr, &htt_frag_desc);
 		if (ret) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				"%s: failed to alloc HTT frag dsc (%d/%d)",
 				__func__, i, desc_pool_size);
 			/* Is there a leak here, is this handling correct? */
@@ -625,7 +625,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			c_element->tx_desc.htt_frag_desc = htt_frag_desc;
 			c_element->tx_desc.htt_frag_desc_paddr = frag_paddr;
 		}
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 			"%s:%d - %d FRAG VA 0x%p FRAG PA 0x%llx",
 			__func__, __LINE__, i,
 			c_element->tx_desc.htt_frag_desc,
@@ -660,7 +660,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 		else
 			pdev->htt_pkt_type = htt_pkt_type_ethernet;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "%s Invalid standard frame type: %d",
 			  __func__, pdev->frame_format);
 		goto control_init_fail;
@@ -727,7 +727,7 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			? 0 : 1;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid std frame type; [en/de]cap: f:%x t:%x r:%x",
 			  pdev->frame_format,
 			  pdev->target_tx_tran_caps, pdev->target_rx_tran_caps);
@@ -777,8 +777,8 @@ ol_txrx_pdev_attach(ol_txrx_pdev_handle pdev)
 			} else {
 #define TRACESTR01 "invalid config: if rx PN check is on the host,"\
 "rx->tx forwarding check needs to also be on the host"
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %s", __func__, TRACESTR01);
 #undef TRACESTR01
 				goto control_init_fail;
@@ -1622,7 +1622,7 @@ ol_txrx_peer_update(ol_txrx_vdev_handle vdev,
 	}
 	default:
 	{
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "ERROR: unknown param %d in %s", select,
 			  __func__);
 		break;
@@ -1976,11 +1976,11 @@ unsigned g_txrx_print_level = TXRX_PRINT_LEVEL_ERR;     /* default */
 void ol_txrx_print_level_set(unsigned level)
 {
 #ifndef TXRX_PRINT_ENABLE
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
 		  "The driver is compiled without TXRX prints enabled.\n"
 		  "To enable them, recompile with TXRX_PRINT_ENABLE defined");
 #else
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 		  "TXRX printout level changed from %d to %d",
 		  g_txrx_print_level, level);
 	g_txrx_print_level = level;
@@ -2262,7 +2262,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(TXRX_DEBUG_LEVEL) && TXRX_DEBUG_LEVEL > 5
 		ol_txrx_pdev_display(vdev->pdev, 0);
 #else
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
 			  "The pdev,vdev,peer display functions are disabled.\n"
 			  "To enable them, recompile with TXRX_DEBUG_LEVEL > 5");
 #endif
@@ -2274,7 +2274,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(ENABLE_TXRX_PROT_ANALYZE)
 		ol_txrx_prot_ans_display(vdev->pdev);
 #else
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
 			  "txrx protocol analysis is disabled.\n"
 			  "To enable it, recompile with "
 			  "ENABLE_TXRX_PROT_ANALYZE defined");
@@ -2284,7 +2284,7 @@ int ol_txrx_debug(ol_txrx_vdev_handle vdev, int debug_specs)
 #if defined(ENABLE_RX_REORDER_TRACE)
 		ol_rx_reorder_trace_display(vdev->pdev, 0, 0);
 #else
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_FATAL,
 			  "rx reorder seq num trace is disabled.\n"
 			  "To enable it, recompile with "
 			  "ENABLE_RX_REORDER_TRACE defined");
@@ -2307,20 +2307,20 @@ void ol_txrx_pdev_display(ol_txrx_pdev_handle pdev, int indent)
 {
 	struct ol_txrx_vdev_t *vdev;
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*s%s:\n", indent, " ", "txrx pdev");
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*spdev object: %p", indent + 4, " ", pdev);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*svdev list:", indent + 4, " ");
 	TAILQ_FOREACH(vdev, &pdev->vdev_list, vdev_list_elem) {
 		ol_txrx_vdev_display(vdev, indent + 8);
 	}
 	ol_txrx_peer_find_display(pdev, indent + 4);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stx desc pool: %d elems @ %p", indent + 4, " ",
 		  pdev->tx_desc.pool_size, pdev->tx_desc.array);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW, " ");
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW, " ");
 	htt_display(pdev->htt_pdev, indent);
 }
 
@@ -2328,17 +2328,17 @@ void ol_txrx_vdev_display(ol_txrx_vdev_handle vdev, int indent)
 {
 	struct ol_txrx_peer_t *peer;
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stxrx vdev: %p\n", indent, " ", vdev);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*sID: %d\n", indent + 4, " ", vdev->vdev_id);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*sMAC addr: %d:%d:%d:%d:%d:%d",
 		  indent + 4, " ",
 		  vdev->mac_addr.raw[0], vdev->mac_addr.raw[1],
 		  vdev->mac_addr.raw[2], vdev->mac_addr.raw[3],
 		  vdev->mac_addr.raw[4], vdev->mac_addr.raw[5]);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer list:", indent + 4, " ");
 	TAILQ_FOREACH(peer, &vdev->peer_list, peer_list_elem) {
 		ol_txrx_peer_display(peer, indent + 8);
@@ -2349,11 +2349,11 @@ void ol_txrx_peer_display(ol_txrx_peer_handle peer, int indent)
 {
 	int i;
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*stxrx peer: %p", indent, " ", peer);
 	for (i = 0; i < MAX_NUM_PEER_ID_PER_PEER; i++) {
 		if (peer->peer_ids[i] != HTT_INVALID_PEER) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 				  "%*sID: %d", indent + 4, " ",
 				  peer->peer_ids[i]);
 		}
@@ -2367,13 +2367,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 	int msdu_idx;
 	int seg_idx;
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		"TSO pkts %lld, bytes %lld\n",
 		pdev->stats.pub.tx.tso.tso_pkts.pkts,
 		pdev->stats.pub.tx.tso.tso_pkts.bytes);
 
 	for (msdu_idx = 0; msdu_idx < NUM_MAX_TSO_MSDUS; msdu_idx++) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"curr msdu idx: %d curr seg idx: %d num segs %d\n",
 			TXRX_STATS_TSO_MSDU_IDX(pdev),
 			TXRX_STATS_TSO_SEG_IDX(pdev),
@@ -2385,13 +2385,13 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 			struct qdf_tso_seg_t tso_seg =
 				 TXRX_STATS_TSO_SEG(pdev, msdu_idx, seg_idx);
 
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				 "msdu idx: %d seg idx: %d\n",
 				 msdu_idx, seg_idx);
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				 "tso_enable: %d\n",
 				 tso_seg.tso_flags.tso_enable);
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				 "fin %d syn %d rst %d psh %d ack %d\n"
 				 "urg %d ece %d cwr %d ns %d\n",
 				 tso_seg.tso_flags.fin, tso_seg.tso_flags.syn,
@@ -2399,7 +2399,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 				 tso_seg.tso_flags.ack, tso_seg.tso_flags.urg,
 				 tso_seg.tso_flags.ece, tso_seg.tso_flags.cwr,
 				 tso_seg.tso_flags.ns);
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				 "tcp_seq_num: 0x%x ip_id: %d\n",
 				 tso_seg.tso_flags.tcp_seq_num,
 				 tso_seg.tso_flags.ip_id);
@@ -2409,7 +2409,7 @@ void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 #else
 void ol_txrx_stats_display_tso(ol_txrx_pdev_handle pdev)
 {
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 	 "TSO is not supported\n");
 }
 #endif
@@ -2429,7 +2429,7 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len)
 
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (!vdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: vdev is NULL", __func__);
 		snprintf(buffer, buf_len, "vdev not found");
 		return len;
@@ -2452,8 +2452,8 @@ ol_txrx_stats(uint8_t vdev_id, char *buffer, unsigned buf_len)
 
 void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 {
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR, "txrx stats:");
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, "txrx stats:");
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		  "  tx: sent %lld msdus (%lld B), "
 		  "      rejected %lld (%lld B), dropped %lld (%lld B)",
 		  pdev->stats.pub.tx.delivered.pkts,
@@ -2466,7 +2466,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.dropped.download_fail.bytes
 		  + pdev->stats.pub.tx.dropped.target_discard.bytes
 		  + pdev->stats.pub.tx.dropped.no_ack.bytes);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		  "    download fail: %lld (%lld B), "
 		  "target discard: %lld (%lld B), "
 		  "no ack: %lld (%lld B)",
@@ -2476,7 +2476,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.dropped.target_discard.bytes,
 		  pdev->stats.pub.tx.dropped.no_ack.pkts,
 		  pdev->stats.pub.tx.dropped.no_ack.bytes);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		  "Tx completion per interrupt:\n"
 		  "Single Packet  %d\n"
 		  " 2-10 Packets  %d\n"
@@ -2494,7 +2494,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.tx.comp_histogram.pkts_41_50,
 		  pdev->stats.pub.tx.comp_histogram.pkts_51_60,
 		  pdev->stats.pub.tx.comp_histogram.pkts_61_plus);
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		  "  rx: %lld ppdus, %lld mpdus, %lld msdus, %lld bytes, %lld errs",
 		  pdev->stats.priv.rx.normal.ppdus,
 		  pdev->stats.priv.rx.normal.mpdus,
@@ -2502,7 +2502,7 @@ void ol_txrx_stats_display(ol_txrx_pdev_handle pdev)
 		  pdev->stats.pub.rx.delivered.bytes,
 		  pdev->stats.priv.rx.err.mpdu_bad);
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		  "  fwd to stack %d, fwd to fw %d, fwd to stack & fw  %d\n",
 		  pdev->stats.pub.rx.intra_bss_fwd.packets_stack,
 		  pdev->stats.pub.rx.intra_bss_fwd.packets_fwd,
@@ -2568,14 +2568,14 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id)
 	ol_txrx_pdev_handle pdev = NULL;
 
 	if (sta_id >= WLAN_MAX_STA_COUNT) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"Invalid sta id passed");
 		return NULL;
 	}
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"PDEV not found for sta_id [%d]", sta_id);
 		return NULL;
 	}
@@ -2583,7 +2583,7 @@ static ol_txrx_vdev_handle ol_txrx_get_vdev_from_sta_id(uint8_t sta_id)
 	peer = ol_txrx_peer_find_by_local_id(pdev, sta_id);
 
 	if (!peer) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"PEER [%d] not found", sta_id);
 		return NULL;
 	}
@@ -2605,7 +2605,7 @@ int ol_txrx_register_tx_flow_control (uint8_t vdev_id,
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid vdev_id %d", __func__, vdev_id);
 		return -EINVAL;
 	}
@@ -2627,7 +2627,7 @@ int ol_txrx_deregister_tx_flow_control_cb(uint8_t vdev_id)
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				"%s: Invalid vdev_id", __func__);
 		return -EINVAL;
 	}
@@ -2654,7 +2654,7 @@ ol_txrx_get_tx_resource(uint8_t sta_id,
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_sta_id(sta_id);
 	if (NULL == vdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid sta_id %d", __func__, sta_id);
 		/* Return true so caller do not understand that resource
 		 * is less than low_watermark.
@@ -2691,7 +2691,7 @@ ol_txrx_ll_set_tx_pause_q_depth(uint8_t vdev_id, int pause_q_depth)
 {
 	ol_txrx_vdev_handle vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	if (NULL == vdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid vdev_id %d", __func__, vdev_id);
 		return -EINVAL;
 	}
@@ -2832,7 +2832,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context,
 	ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context;
 
 	if (qdf_unlikely(!pdev)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			      "%s: Invalid context", __func__);
 		cdf_mem_free(rxpkt);
 		return;
@@ -2841,7 +2841,7 @@ void ol_txrx_ipa_uc_fw_op_event_handler(void *context,
 	if (pdev->ipa_uc_op_cb) {
 		pdev->ipa_uc_op_cb(rxpkt, pdev->osif_dev);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			      "%s: ipa_uc_op_cb NULL", __func__);
 		cdf_mem_free(rxpkt);
 	}
@@ -2865,7 +2865,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev, uint8_t *op_msg)
 
 	pkt = cds_alloc_ol_rx_pkt(sched_ctx);
 	if (qdf_unlikely(!pkt)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			      "%s: Not able to allocate context", __func__);
 		return;
 	}
@@ -2883,7 +2883,7 @@ void ol_txrx_ipa_uc_op_response(ol_txrx_pdev_handle pdev,
 	if (pdev->ipa_uc_op_cb) {
 		pdev->ipa_uc_op_cb(op_msg, pdev->osif_dev);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 		    "%s: IPA callback function is not registered", __func__);
 		cdf_mem_free(op_msg);
 		return;
@@ -2924,7 +2924,7 @@ void ol_txrx_display_stats(uint16_t value)
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: pdev is NULL", __func__);
 		return;
 	}
@@ -2943,7 +2943,7 @@ void ol_txrx_display_stats(uint16_t value)
 		cdf_nbuf_tx_desc_count_display();
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 					"%s: Unknown value", __func__);
 		break;
 	}
@@ -2955,7 +2955,7 @@ void ol_txrx_clear_stats(uint16_t value)
 
 	pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	if (!pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			"%s: pdev is NULL", __func__);
 		return;
 	}
@@ -2971,7 +2971,7 @@ void ol_txrx_clear_stats(uint16_t value)
 		cdf_nbuf_tx_desc_count_clear();
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 					"%s: Unknown value", __func__);
 		break;
 	}
@@ -3355,7 +3355,7 @@ void ol_txrx_lro_flush_handler(void *context,
 	ol_txrx_pdev_handle pdev = (ol_txrx_pdev_handle)context;
 
 	if (qdf_unlikely(!pdev)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			 "%s: Invalid context", __func__);
 		qdf_assert(0);
 		return;
@@ -3364,7 +3364,7 @@ void ol_txrx_lro_flush_handler(void *context,
 	if (pdev->lro_info.lro_flush_cb)
 		pdev->lro_info.lro_flush_cb(pdev->lro_info.lro_data);
 	else
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			 "%s: lro_flush_cb NULL", __func__);
 }
 
@@ -3391,7 +3391,7 @@ void ol_txrx_lro_flush(void *data)
 	} else {
 		pkt = cds_alloc_ol_rx_pkt(sched_ctx);
 		if (qdf_unlikely(!pkt)) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 				 "%s: Not able to allocate context", __func__);
 			return;
 		}
diff --git a/core/dp/txrx/ol_txrx_event.c b/core/dp/txrx/ol_txrx_event.c
index 87c91ab253f8..0743a00ed4b4 100644
--- a/core/dp/txrx/ol_txrx_event.c
+++ b/core/dp/txrx/ol_txrx_event.c
@@ -33,7 +33,7 @@ static inline wdi_event_subscribe *wdi_event_next_sub(wdi_event_subscribe *
 						      wdi_sub)
 {
 	if (!wdi_sub) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid subscriber in %s\n", __func__);
 		return NULL;
 	}
@@ -84,12 +84,12 @@ wdi_event_handler(enum WDI_EVENT event,
 	 * Input validation
 	 */
 	if (!event) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid WDI event in %s\n", __func__);
 		return;
 	}
 	if (!txrx_pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid pdev in WDI event handler\n");
 		return;
 	}
@@ -113,17 +113,17 @@ wdi_event_sub(struct ol_txrx_pdev_t *txrx_pdev,
 	wdi_event_subscribe *wdi_sub;
 	/* Input validation */
 	if (!txrx_pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid txrx_pdev in %s", __func__);
 		return A_ERROR;
 	}
 	if (!event_cb_sub) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid callback in %s", __func__);
 		return A_ERROR;
 	}
 	if ((!event) || (event >= WDI_EVENT_LAST) || (event < WDI_EVENT_BASE)) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid event in %s", __func__);
 		return A_ERROR;
 	}
@@ -157,7 +157,7 @@ wdi_event_unsub(struct ol_txrx_pdev_t *txrx_pdev,
 
 	/* Input validation */
 	if (!event_cb_sub) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid callback in %s", __func__);
 		return A_ERROR;
 	}
@@ -179,7 +179,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev)
 {
 	/* Input validation */
 	if (!txrx_pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid device in %s\nWDI event attach failed",
 			  __func__);
 		return A_ERROR;
@@ -190,7 +190,7 @@ A_STATUS wdi_event_attach(struct ol_txrx_pdev_t *txrx_pdev)
 					    sizeof(wdi_event_subscribe *) *
 					    WDI_NUM_EVENTS);
 	if (!txrx_pdev->wdi_event_list) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Insufficient memory for the WDI event lists\n");
 		return A_NO_MEMORY;
 	}
@@ -202,13 +202,13 @@ A_STATUS wdi_event_detach(struct ol_txrx_pdev_t *txrx_pdev)
 	int i;
 	wdi_event_subscribe *wdi_sub;
 	if (!txrx_pdev) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid device in %s\nWDI detach failed",
 			  __func__);
 		return A_ERROR;
 	}
 	if (!txrx_pdev->wdi_event_list) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
 			  "%s: wdi_event_list is NULL", __func__);
 		return A_ERROR;
 	}
diff --git a/core/dp/txrx/ol_txrx_internal.h b/core/dp/txrx/ol_txrx_internal.h
index 25d25f09d5d7..243e1212b159 100644
--- a/core/dp/txrx/ol_txrx_internal.h
+++ b/core/dp/txrx/ol_txrx_internal.h
@@ -381,7 +381,7 @@ ol_txrx_frms_dump(const char *name,
 	uint8_t *p;
 
 	if (name) {
-		CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO, "%s\n",
+		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO, "%s\n",
 			  name);
 	}
 	while (frm) {
@@ -435,8 +435,8 @@ ol_txrx_frms_dump(const char *name,
 				ip_prot = ipv6_hdr->next_hdr;
 				tcp_offset = l2_hdr_size + IPV6_HDR_LEN;
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO,
 					  "frame %p non-IP ethertype (%x)\n",
 					  frm, ethtype);
 				goto NOT_IP_TCP;
@@ -451,13 +451,13 @@ ol_txrx_frms_dump(const char *name,
 					(tcp_hdr->seq_num[1] << 16) |
 					(tcp_hdr->seq_num[1] << 8) |
 					(tcp_hdr->seq_num[1] << 0);
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO,
 					  "frame %p: TCP seq num = %d\n", frm,
 					  tcp_seq_num);
 #else
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO,
 					  "frame %p: TCP seq num = %d\n", frm,
 					  ((*(p + tcp_offset + 4)) << 24) |
 					  ((*(p + tcp_offset + 5)) << 16) |
@@ -465,8 +465,8 @@ ol_txrx_frms_dump(const char *name,
 					  (*(p + tcp_offset + 7)));
 #endif
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO,
 					  "frame %p non-TCP IP protocol (%x)\n",
 					  frm, ip_prot);
 			}
@@ -502,13 +502,13 @@ NOT_IP_TCP:
 				i += frag_bytes;
 			}
 
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 				  "frame %p data (%p), hex dump of bytes 0-%d of %d:\n",
 				frm, p, len_lim - 1, (int)cdf_nbuf_len(frm));
 			p = local_buf;
 			while (len_lim > 16) {
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO,
 					  "  "        /* indent */
 					  "%02x %02x %02x %02x %02x %02x %02x %02x "
 					  "%02x %02x %02x %02x %02x %02x %02x %02x\n",
@@ -521,15 +521,15 @@ NOT_IP_TCP:
 				p += 16;
 				len_lim -= 16;
 			}
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 				  "  " /* indent */);
 			while (len_lim > 0) {
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO, "%02x ", *p);
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO, "%02x ", *p);
 				p++;
 				len_lim--;
 			}
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO,
 				  "\n");
 		}
 		frm = cdf_nbuf_next(frm);
diff --git a/core/dp/txrx/ol_txrx_peer_find.c b/core/dp/txrx/ol_txrx_peer_find.c
index 7e8c38d44b54..ea6dee8b22f0 100644
--- a/core/dp/txrx/ol_txrx_peer_find.c
+++ b/core/dp/txrx/ol_txrx_peer_find.c
@@ -457,26 +457,26 @@ void ol_txrx_peer_find_display(ol_txrx_pdev_handle pdev, int indent)
 {
 	int i, max_peers;
 
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer map:\n", indent, " ");
 	max_peers = ol_cfg_max_peer_id(pdev->ctrl_pdev) + 1;
 	for (i = 0; i < max_peers; i++) {
 		if (pdev->peer_id_to_obj_map[i]) {
-			CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 				  "%*sid %d -> %p\n",
 				  indent + 4, " ", i,
 				  pdev->peer_id_to_obj_map[i]);
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_TXRX, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%*speer hash table:\n", indent, " ");
 	for (i = 0; i <= pdev->peer_hash.mask; i++) {
 		if (!TAILQ_EMPTY(&pdev->peer_hash.bins[i])) {
 			struct ol_txrx_peer_t *peer;
 			TAILQ_FOREACH(peer, &pdev->peer_hash.bins[i],
 				      hash_list_elem) {
-				CDF_TRACE(QDF_MODULE_ID_TXRX,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_TXRX,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  "%*shash idx %d -> %p (%02x:%02x:%02x:%02x:%02x:%02x)\n",
 					indent + 4, " ", i, peer,
 					peer->mac_addr.raw[0],
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index cf4a76ce355f..e9e44cae717e 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -157,26 +157,26 @@
 #define WLAN_CHIP_VERSION   "WCNSS"
 
 #ifndef HDD_DISALLOW_LEGACY_HDDLOG
-#define hddLog(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
+#define hddLog(level, args ...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 #endif
-#define hdd_log(level, args...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
+#define hdd_log(level, args...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 #define hdd_logfl(level, format, args...) hdd_log(level, FL(format), ## args)
 
 #define hdd_alert(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_FATAL, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_FATAL, format, ## args)
 #define hdd_err(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_ERROR, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
 #define hdd_warn(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_WARN, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
 #define hdd_notice(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_INFO, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
 #define hdd_info(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_INFO_HIGH, format, ## args)
 #define hdd_debug(format, args...) \
-		hdd_logfl(CDF_TRACE_LEVEL_DEBUG, format, ## args)
+		hdd_logfl(QDF_TRACE_LEVEL_DEBUG, format, ## args)
 
-#define ENTER() hdd_logfl(CDF_TRACE_LEVEL_INFO_LOW, "enter")
-#define EXIT() hdd_logfl(CDF_TRACE_LEVEL_INFO_LOW, "exit")
+#define ENTER() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "enter")
+#define EXIT() hdd_logfl(QDF_TRACE_LEVEL_INFO_LOW, "exit")
 
 #define WLAN_HDD_GET_PRIV_PTR(__dev__) (hdd_adapter_t *)(netdev_priv((__dev__)))
 
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index dcfb2e69a420..45f89606363c 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -304,7 +304,7 @@ hdd_conn_save_connected_bss_type(hdd_station_ctx_t *pHddStaCtx,
 	      so CSR should never send this back to us.*/
 	case eCSR_BSS_TYPE_ANY:
 	default:
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		break;
 	}
 }
@@ -324,12 +324,12 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo,
 	hdd_station_ctx_t *pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 	eCsrEncryptionType encryptType = eCSR_ENCRYPT_TYPE_NONE;
 
-	CDF_ASSERT(pRoamInfo);
+	QDF_ASSERT(pRoamInfo);
 
 	if (pRoamInfo) {
 		/* Save the BSSID for the connection */
 		if (eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) {
-			CDF_ASSERT(pRoamInfo->pBssDesc);
+			QDF_ASSERT(pRoamInfo->pBssDesc);
 			qdf_copy_macaddr(&pHddStaCtx->conn_info.bssId,
 					 &pRoamInfo->bssid);
 
@@ -352,14 +352,14 @@ hdd_conn_save_connect_info(hdd_adapter_t *pAdapter, tCsrRoamInfo *pRoamInfo,
 			 * can't happen. We need a valid IBSS or Infra setting
 			 * in the BSSDescription or we can't function.
 			 */
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 
 		/* notify WMM */
 		hdd_wmm_connect(pAdapter, pRoamInfo, eBssType);
 
 		if (!pRoamInfo->u.pConnectedProfile) {
-			CDF_ASSERT(pRoamInfo->u.pConnectedProfile);
+			QDF_ASSERT(pRoamInfo->u.pConnectedProfile);
 		} else {
 			/* Get Multicast Encryption Type */
 			encryptType =
@@ -1437,7 +1437,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 			roam_profile.SSID.length);
 	ssid_ie_len = 2 + roam_profile.SSID.length;
 	hdd_notice("SSIDIE:");
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
 			   buf_ssid_ie, ssid_ie_len);
 	final_req_ie = kmalloc(IW_GENERIC_IE_MAX, GFP_KERNEL);
 	if (final_req_ie == NULL)
@@ -1450,7 +1450,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 	cdf_mem_zero(final_req_ie + (ssid_ie_len + reqRsnLength),
 		IW_GENERIC_IE_MAX - (ssid_ie_len + reqRsnLength));
 	hdd_notice("Req RSN IE:");
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
 			   final_req_ie, (ssid_ie_len + reqRsnLength));
 	cfg80211_roamed_bss(dev, bss,
 			final_req_ie, (ssid_ie_len + reqRsnLength),
@@ -1461,7 +1461,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev,
 		pCsrRoamInfo->nAssocReqLength);
 
 	hdd_notice("ReAssoc Req IE dump");
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
 		assoc_req_ies, pCsrRoamInfo->nAssocReqLength);
 
 	wlan_hdd_send_roam_auth_event(pHddCtx, pCsrRoamInfo->bssid.bytes,
@@ -1949,9 +1949,9 @@ static QDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter,
 
 						hdd_notice(
 							"Reassoc Req IE dump");
-						CDF_TRACE_HEX_DUMP(
+						QDF_TRACE_HEX_DUMP(
 							QDF_MODULE_ID_HDD,
-							CDF_TRACE_LEVEL_DEBUG,
+							QDF_TRACE_LEVEL_DEBUG,
 							pFTAssocReq,
 							assocReqlen);
 
@@ -2344,7 +2344,7 @@ static void hdd_roam_ibss_indication_handler(hdd_adapter_t *pAdapter,
 			QDF_MAC_ADDR_BROADCAST_INITIALIZER;
 
 		if (NULL == pRoamInfo) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return;
 		}
 
@@ -3861,7 +3861,7 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
 	pWextState = WLAN_HDD_GET_WEXT_STATE_PTR(pAdapter);
 	pHddStaCtx = WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_RX_SME_MSG,
 				pAdapter->sessionId, roamStatus));
 
 	switch (roamStatus) {
diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c
index a107cb83e644..b85921b889be 100644
--- a/core/hdd/src/wlan_hdd_cfg.c
+++ b/core/hdd/src/wlan_hdd_cfg.c
@@ -3887,7 +3887,7 @@ static QDF_STATUS find_cfg_item(tCfgIniEntry *iniTable, unsigned long entries,
 	for (i = 0; i < entries; i++) {
 		if (strcmp(iniTable[i].name, name) == 0) {
 			*value = iniTable[i].value;
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "Found %s entry for Name=[%s] Value=[%s] ",
 				  WLAN_INI_FILE, name, *value);
 			return QDF_STATUS_SUCCESS;
@@ -4082,7 +4082,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 			if (QDF_STATUS_SUCCESS == match_status) {
 				rv = kstrtos32(value_str, 10, &svalue);
 				if (rv < 0) {
-					hddLog(CDF_TRACE_LEVEL_WARN,
+					hddLog(QDF_TRACE_LEVEL_WARN,
 					       "%s: Reg Parameter %s invalid. Enforcing Default",
 					       __func__, pRegEntry->RegName);
 					svalue =
@@ -4142,7 +4142,7 @@ static QDF_STATUS hdd_apply_cfg_ini(hdd_context_t *pHddCtx,
 		/* Handle string parameters */
 		else if (WLAN_PARAM_String == pRegEntry->RegType) {
 #ifdef WLAN_CFG_DEBUG
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "RegName = %s, VarOffset %u VarSize %u VarDefault %s",
 				  pRegEntry->RegName, pRegEntry->VarOffset,
 				  pRegEntry->VarSize,
@@ -4499,700 +4499,700 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
 {
 	int i;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "*********Config values in HDD Adapter*******");
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [RTSThreshold] Value = %u",
 		  pHddCtx->config->RTSThreshold);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [OperatingChannel] Value = [%u]",
 		  pHddCtx->config->OperatingChannel);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [PowerUsageControl] Value = [%s]",
 		  pHddCtx->config->PowerUsageControl);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fIsImpsEnabled] Value = [%u]",
 		  pHddCtx->config->fIsImpsEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nVccRssiTrigger] Value = [%u]",
 		  pHddCtx->config->nVccRssiTrigger);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssBssid] Value =[" MAC_ADDRESS_STR "]",
 		  MAC_ADDR_ARRAY(pHddCtx->config->IbssBssid.bytes));
 
 	for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "Name = [Intf%dMacAddress] Value =[" MAC_ADDRESS_STR "]",
 			  i, MAC_ADDR_ARRAY(pHddCtx->config->intfMacAddr[i].bytes));
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApEnableUapsd] value = [%u]",
 		  pHddCtx->config->apUapsdEnabled);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableApProt] value = [%u]",
 		  pHddCtx->config->apProtEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gAPAutoShutOff] Value = [%u]",
 		  pHddCtx->config->nAPAutoShutOff);
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gWlanMccToSccSwitchMode] Value = [%u]",
 		  pHddCtx->config->WlanMccToSccSwitchMode);
 #endif
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gWlanAutoShutdown] Value = [%u]",
 		  pHddCtx->config->WlanAutoShutdown);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableListenMode] Value = [%u]",
 		  pHddCtx->config->nEnableListenMode);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApProtection] value = [%u]",
 		  pHddCtx->config->apProtection);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableApOBSSProt] value = [%u]",
 		  pHddCtx->config->apOBSSProtEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS,
 		pHddCtx->config->force_sap_acs);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_START_CH,
 		pHddCtx->config->force_sap_acs_st_ch);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		"Name = [%s] value = [%u]", CFG_FORCE_SAP_ACS_END_CH,
 		pHddCtx->config->force_sap_acs_end_ch);
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
-	CDF_TRACE(QDF_MODULE_ID_HDD,
-		  CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD,
+		  QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [sap_channel_avoidance] value = [%u]",
 		  pHddCtx->config->sap_channel_avoidance);
 #endif /* FEATURE_AP_MCC_CH_AVOIDANCE */
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		"Name = [%s] value = [%u]", CFG_SAP_P2P_11AC_OVERRIDE_NAME,
 				pHddCtx->config->sap_p2p_11ac_override);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [ChannelBondingMode] Value = [%u]",
 		  pHddCtx->config->nChannelBondingMode24GHz);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [ChannelBondingMode] Value = [%u]",
 		  pHddCtx->config->nChannelBondingMode5GHz);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [dot11Mode] Value = [%u]",
 		  pHddCtx->config->dot11Mode);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [WmmMode] Value = [%u] ", pHddCtx->config->WmmMode);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [UapsdMask] Value = [0x%x] ",
 		  pHddCtx->config->UapsdMask);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [ImplicitQosIsEnabled] Value = [%u]",
 		  (int)pHddCtx->config->bImplicitQosEnabled);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdVoSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdVoSrvIntv);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdVoSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdVoSuspIntv);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdViSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdViSrvIntv);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdViSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdViSuspIntv);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdBeSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBeSrvIntv);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdBeSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBeSuspIntv);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdBkSrvIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBkSrvIntv);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraUapsdBkSuspIntv] Value = [%u] ",
 		  pHddCtx->config->InfraUapsdBkSuspIntv);
 #ifdef FEATURE_WLAN_ESE
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraInactivityInterval] Value = [%u] ",
 		  pHddCtx->config->InfraInactivityInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [EseEnabled] Value = [%u] ",
 		  pHddCtx->config->isEseIniFeatureEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [FastTransitionEnabled] Value = [%u] ",
 		  pHddCtx->config->isFastTransitionEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gTxPowerCap] Value = [%u] dBm ",
 		  pHddCtx->config->nTxPowerCap);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [FastRoamEnabled] Value = [%u] ",
 		  pHddCtx->config->isFastRoamIniFeatureEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [MAWCEnabled] Value = [%u] ",
 		  pHddCtx->config->MAWCEnabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [RoamRssiDiff] Value = [%u] ",
 		  pHddCtx->config->RoamRssiDiff);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [isWESModeEnabled] Value = [%u] ",
 		  pHddCtx->config->isWESModeEnabled);
 #ifdef FEATURE_WLAN_OKC
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [OkcEnabled] Value = [%u] ",
 		  pHddCtx->config->isOkcIniFeatureEnabled);
 #endif
 #ifdef FEATURE_WLAN_SCAN_PNO
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [configPNOScanSupport] Value = [%u] ",
 		  pHddCtx->config->configPNOScanSupport);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [configPNOScanTimerRepeatValue] Value = [%u] ",
 		  pHddCtx->config->configPNOScanTimerRepeatValue);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gPNOSlowScanMultiplier] Value = [%u] ",
 		  pHddCtx->config->pno_slow_scan_multiplier);
 #endif
 #ifdef FEATURE_WLAN_TDLS
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fEnableTDLSSupport] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSSupport);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fEnableTDLSImplicitTrigger] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSImplicitTrigger);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fTDLSExternalControl] Value = [%u] ",
 		  pHddCtx->config->fTDLSExternalControl);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fTDLSUapsdMask] Value = [%u] ",
 		  pHddCtx->config->fTDLSUapsdMask);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fEnableTDLSBufferSta] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSBufferSta);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fEnableTDLSWmmMode] Value = [%u] ",
 		  pHddCtx->config->fEnableTDLSWmmMode);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [enable_tdls_scan] Value = [%u]",
 		  pHddCtx->config->enable_tdls_scan);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraDirAcVo] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcVo);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraNomMsduSizeAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcVo);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMeanDataRateAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcVo);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMinPhyRateAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcVo);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraSbaAcVo] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcVo);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraDirAcVi] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcVi);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraNomMsduSizeAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcVi);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMeanDataRateAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcVi);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMinPhyRateAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcVi);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraSbaAcVi] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcVi);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraDirAcBe] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcBe);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraNomMsduSizeAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcBe);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMeanDataRateAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcBe);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMinPhyRateAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcBe);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraSbaAcBe] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcBe);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraDirAcBk] Value = [%u] ",
 		  pHddCtx->config->InfraDirAcBk);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraNomMsduSizeAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraNomMsduSizeAcBk);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMeanDataRateAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraMeanDataRateAcBk);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraMinPhyRateAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraMinPhyRateAcBk);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [InfraSbaAcBk] Value = [0x%x] ",
 		  pHddCtx->config->InfraSbaAcBk);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [DelayedTriggerFrmInt] Value = [%u] ",
 		  pHddCtx->config->DelayedTriggerFrmInt);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [mcastBcastFilterSetting] Value = [%u] ",
 		  pHddCtx->config->mcastBcastFilterSetting);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fhostArpOffload] Value = [%u] ",
 		  pHddCtx->config->fhostArpOffload);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [ssdp] Value = [%u] ", pHddCtx->config->ssdp);
 #ifdef FEATURE_WLAN_RA_FILTERING
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [RArateLimitInterval] Value = [%u] ",
 		  pHddCtx->config->RArateLimitInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [IsRArateLimitEnabled] Value = [%u] ",
 		  pHddCtx->config->IsRArateLimitEnabled);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fFTResourceReqSupported] Value = [%u] ",
 		  pHddCtx->config->fFTResourceReqSupported);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nNeighborLookupRssiThreshold] Value = [%u] ",
 		  pHddCtx->config->nNeighborLookupRssiThreshold);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [delay_before_vdev_stop] Value = [%u] ",
 		  pHddCtx->config->delay_before_vdev_stop);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nOpportunisticThresholdDiff] Value = [%u] ",
 		  pHddCtx->config->nOpportunisticThresholdDiff);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nRoamRescanRssiDiff] Value = [%u] ",
 		  pHddCtx->config->nRoamRescanRssiDiff);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nNeighborScanMinChanTime] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanMinChanTime);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nNeighborScanMaxChanTime] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanMaxChanTime);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nMaxNeighborRetries] Value = [%u] ",
 		  pHddCtx->config->nMaxNeighborReqTries);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nNeighborScanPeriod] Value = [%u] ",
 		  pHddCtx->config->nNeighborScanPeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nNeighborScanResultsRefreshPeriod] Value = [%u] ",
 		  pHddCtx->config->nNeighborResultsRefreshPeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nEmptyScanRefreshPeriod] Value = [%u] ",
 		  pHddCtx->config->nEmptyScanRefreshPeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nRoamBmissFirstBcnt] Value = [%u] ",
 		  pHddCtx->config->nRoamBmissFirstBcnt);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nRoamBmissFinalBcnt] Value = [%u] ",
 		  pHddCtx->config->nRoamBmissFinalBcnt);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nRoamBeaconRssiWeight] Value = [%u] ",
 		  pHddCtx->config->nRoamBeaconRssiWeight);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [allowDFSChannelRoam] Value = [%u] ",
 		  pHddCtx->config->allowDFSChannelRoam);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nhi_rssi_scan_max_count] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_max_count);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nhi_rssi_scan_rssi_delta] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_rssi_delta);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nhi_rssi_scan_delay] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_delay);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ",
 		  pHddCtx->config->nhi_rssi_scan_rssi_ub);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [burstSizeDefinition] Value = [0x%x] ",
 		  pHddCtx->config->burstSizeDefinition);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [tsInfoAckPolicy] Value = [0x%x] ",
 		  pHddCtx->config->tsInfoAckPolicy);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [rfSettlingTimeUs] Value = [%u] ",
 		  pHddCtx->config->rfSettlingTimeUs);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [bSingleTidRc] Value = [%u] ",
 		  pHddCtx->config->bSingleTidRc);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gDynamicPSPollvalue] Value = [%u] ",
 		  pHddCtx->config->dynamicPsPollValue);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gAddTSWhenACMIsOff] Value = [%u] ",
 		  pHddCtx->config->AddTSWhenACMIsOff);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gValidateScanList] Value = [%u] ",
 		  pHddCtx->config->fValidateScanList);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gStaKeepAlivePeriod] Value = [%u] ",
 		  pHddCtx->config->infraStaKeepAlivePeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApDataAvailPollInterVal] Value = [%u] ",
 		  pHddCtx->config->apDataAvailPollPeriodInMs);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [BandCapability] Value = [%u] ",
 		  pHddCtx->config->nBandCapability);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fEnableBeaconEarlyTermination] Value = [%u] ",
 		  pHddCtx->config->fEnableBeaconEarlyTermination);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [teleBcnWakeupEnable] Value = [%u] ",
 		  pHddCtx->config->teleBcnWakeupEn);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [transListenInterval] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnTransListenInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [transLiNumIdleBeacons] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnTransLiNumIdleBeacons);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [maxListenInterval] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnMaxListenInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [maxLiNumIdleBeacons] Value = [%u] ",
 		  pHddCtx->config->nTeleBcnMaxLiNumIdleBeacons);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [bcnEarlyTermWakeInterval] Value = [%u] ",
 		  pHddCtx->config->bcnEarlyTermWakeInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApDataAvailPollInterVal] Value = [%u] ",
 		  pHddCtx->config->apDataAvailPollPeriodInMs);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableBypass11d] Value = [%u] ",
 		  pHddCtx->config->enableBypass11d);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableDFSChnlScan] Value = [%u] ",
 		  pHddCtx->config->enableDFSChnlScan);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableDFSPnoChnlScan] Value = [%u] ",
 		  pHddCtx->config->enable_dfs_pno_chnl_scan);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gReportMaxLinkSpeed] Value = [%u] ",
 		  pHddCtx->config->reportMaxLinkSpeed);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [thermalMitigationEnable] Value = [%u] ",
 		  pHddCtx->config->thermalMitigationEnable);
 #ifdef WLAN_FEATURE_11AC
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gVhtChannelWidth] value = [%u]",
 		  pHddCtx->config->vhtChannelWidth);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [enableFirstScan2GOnly] Value = [%u] ",
 		  pHddCtx->config->enableFirstScan2GOnly);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [skipDfsChnlInP2pSearch] Value = [%u] ",
 		  pHddCtx->config->skipDfsChnlInP2pSearch);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [ignoreDynamicDtimInP2pMode] Value = [%u] ",
 		  pHddCtx->config->ignoreDynamicDtimInP2pMode);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [enableRxSTBC] Value = [%u] ",
 		  pHddCtx->config->enableRxSTBC);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableLpwrImgTransition] Value = [%u] ",
 		  pHddCtx->config->enableLpwrImgTransition);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableSSR] Value = [%u] ",
 		  pHddCtx->config->enableSSR);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableVhtFor24GHzBand] Value = [%u] ",
 		  pHddCtx->config->enableVhtFor24GHzBand);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gFlexConnectPowerFactor] Value = [%u] ",
 		  pHddCtx->config->flexConnectPowerFactor);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableIbssHeartBeatOffload] Value = [%u] ",
 		  pHddCtx->config->enableIbssHeartBeatOffload);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gAntennaDiversity] Value = [%u] ",
 		  pHddCtx->config->antennaDiversity);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gGoLinkMonitorPeriod] Value = [%u]",
 		  pHddCtx->config->goLinkMonitorPeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApLinkMonitorPeriod] Value = [%u]",
 		  pHddCtx->config->apLinkMonitorPeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gGoKeepAlivePeriod] Value = [%u]",
 		  pHddCtx->config->goKeepAlivePeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gApKeepAlivePeriod]Value = [%u]",
 		  pHddCtx->config->apKeepAlivePeriod);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gAmsduSupportInAMPDU] Value = [%u] ",
 		  pHddCtx->config->isAmsduSupportInAMPDU);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [nSelect5GHzMargin] Value = [%u] ",
 		  pHddCtx->config->nSelect5GHzMargin);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gCoalesingInIBSS] Value = [%u] ",
 		  pHddCtx->config->isCoalesingInIBSSAllowed);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssATIMWinSize] Value = [%u] ",
 		  pHddCtx->config->ibssATIMWinSize);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssIsPowerSaveAllowed] Value = [%u] ",
 		  pHddCtx->config->isIbssPowerSaveAllowed);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssIsPowerCollapseAllowed] Value = [%u] ",
 		  pHddCtx->config->isIbssPowerCollapseAllowed);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssAwakeOnTxRx] Value = [%u] ",
 		  pHddCtx->config->isIbssAwakeOnTxRx);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssInactivityTime] Value = [%u] ",
 		  pHddCtx->config->ibssInactivityCount);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssTxSpEndInactivityTime] Value = [%u] ",
 		  pHddCtx->config->ibssTxSpEndInactivityTime);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssPsWarmupTime] Value = [%u] ",
 		  pHddCtx->config->ibssPsWarmupTime);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIbssPs1RxChainInAtim] Value = [%u] ",
 		  pHddCtx->config->ibssPs1RxChainInAtimEnable);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fDfsPhyerrFilterOffload] Value = [%u] ",
 		  pHddCtx->config->fDfsPhyerrFilterOffload);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIgnorePeerErpInfo] Value = [%u] ",
 		  pHddCtx->config->ignore_peer_erp_info);
 #ifdef IPA_OFFLOAD
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIPAConfig] Value = [0x%x] ",
 		  pHddCtx->config->IpaConfig);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIPADescSize] Value = [%u] ",
 		  pHddCtx->config->IpaDescSize);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [IpaHighBandwidthMbpsg] Value = [%u] ",
 		  pHddCtx->config->IpaHighBandwidthMbps);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [IpaMediumBandwidthMbps] Value = [%u] ",
 		  pHddCtx->config->IpaMediumBandwidthMbps);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [IpaLowBandwidthMbps] Value = [%u] ",
 		  pHddCtx->config->IpaLowBandwidthMbps);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableOverLapCh] Value = [%u] ",
 		  pHddCtx->config->gEnableOverLapCh);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gMaxOffloadPeers] Value = [%u] ",
 		  pHddCtx->config->apMaxOffloadPeers);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gMaxOffloadReorderBuffs] value = [%u] ",
 		  pHddCtx->config->apMaxOffloadReorderBuffs);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gAllowDFSChannelRoam] Value = [%u] ",
 		  pHddCtx->config->allowDFSChannelRoam);
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       "Name = [gMaxConcurrentActiveSessions] Value = [%u] ",
 	       pHddCtx->config->gMaxConcurrentActiveSessions);
 
 #ifdef MSM_PLATFORM
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gBusBandwidthHighThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthHighThreshold);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gBusBandwidthMediumThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthMediumThreshold);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gBusBandwidthLowThreshold] Value = [%u] ",
 		  pHddCtx->config->busBandwidthLowThreshold);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gbusBandwidthComputeInterval] Value = [%u] ",
 		  pHddCtx->config->busBandwidthComputeInterval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gTcpDelAckThresholdHigh] Value = [%u] ",
 		  pHddCtx->config->tcpDelackThresholdHigh);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gTcpDelAckThresholdLow] Value = [%u] ",
 		  pHddCtx->config->tcpDelackThresholdLow);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		"Name = [%s] Value = [%u] ",
 		CFG_TCP_TX_HIGH_TPUT_THRESHOLD_NAME,
 		pHddCtx->config->tcp_tx_high_tput_thres);
 
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gIgnoreCAC] Value = [%u] ",
 		  pHddCtx->config->ignoreCAC);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gSapPreferredChanLocation] Value = [%u] ",
 		  pHddCtx->config->gSapPreferredChanLocation);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gDisableDfsJapanW53] Value = [%u] ",
 		  pHddCtx->config->gDisableDfsJapanW53);
 #ifdef FEATURE_GREEN_AP
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableGreenAp] Value = [%u] ",
 		  pHddCtx->config->enableGreenAP);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEenableEGAP] Value = [%u] ",
 		  pHddCtx->config->enable_egap);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEGAPInactTime] Value = [%u] ",
 		  pHddCtx->config->egap_inact_time);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEGAPWaitTime] Value = [%u] ",
 		  pHddCtx->config->egap_wait_time);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEGAPFeatures] Value = [%u] ",
 		  pHddCtx->config->egap_feature_flag);
 #endif
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [isRoamOffloadEnabled] Value = [%u]",
 		  pHddCtx->config->isRoamOffloadEnabled);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableSifsBurst] Value = [%u]",
 		  pHddCtx->config->enableSifsBurst);
 
 #ifdef WLAN_FEATURE_LPSS
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableLpassSupport] Value = [%u] ",
 		  pHddCtx->config->enable_lpass_support);
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableSelfRecovery] Value = [%u]",
 		  pHddCtx->config->enableSelfRecovery);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableSapSuspend] Value = [%u]",
 		  pHddCtx->config->enableSapSuspend);
 
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWgotoSuspend] Value = [%u]",
 		  pHddCtx->config->extWowGotoSuspend);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWowApp1WakeupPinNumber] Value = [%u]",
 		  pHddCtx->config->extWowApp1WakeupPinNumber);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWowApp2WakeupPinNumber] Value = [%u]",
 		  pHddCtx->config->extWowApp2WakeupPinNumber);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2KAInitPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAInitPingInterval);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2KAMinPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAMinPingInterval);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2KAMaxPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAMaxPingInterval);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2KAIncPingInterval] Value = [%u]",
 		  pHddCtx->config->extWowApp2KAIncPingInterval);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2TcpSrcPort] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpSrcPort);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2TcpDstPort] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpDstPort);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2TcpTxTimeout] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpTxTimeout);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gExtWoWApp2TcpRxTimeout] Value = [%u]",
 		  pHddCtx->config->extWowApp2TcpRxTimeout);
 #endif
 
 #ifdef DHCP_SERVER_OFFLOAD
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gDHCPServerOffloadEnable] Value = [%u]",
 		  pHddCtx->config->enableDHCPServerOffload);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gDHCPMaxNumClients] Value = [%u]",
 		  pHddCtx->config->dhcpMaxNumClients);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gDHCPServerIP] Value = [%s]",
 		  pHddCtx->config->dhcpServerIP);
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gEnableDumpCollect] Value = [%u]",
 			pHddCtx->config->is_ramdump_enabled);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [gP2PListenDeferInterval] Value = [%u]",
 		  pHddCtx->config->p2p_listen_defer_interval);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [is_ps_enabled] value = [%d]",
 		  pHddCtx->config->is_ps_enabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [policy_manager_enabled] value = [%d]",
 		  pHddCtx->config->policy_manager_enabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [tso_enable] value = [%d]",
 		  pHddCtx->config->tso_enable);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [LROEnable] value = [%d]",
 		  pHddCtx->config->lro_enable);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [active_mode_offload] value = [%d]",
 		  pHddCtx->config->active_mode_offload);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [gfine_time_meas_cap] value = [%u]",
 		  pHddCtx->config->fine_time_meas_cap);
 #ifdef WLAN_FEATURE_FASTPATH
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [fastpath_enable] Value = [%u]",
 		  pHddCtx->config->fastpath_enable);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [max_scan_count] value = [%d]",
 		  pHddCtx->config->max_scan_count);
 #ifdef FEATURE_NAPI_DEBUG
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [%s] value = [%d]",
 		  CFG_ENABLE_RX_THREAD, pHddCtx->config->enableRxThread);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [%s] value = [%d]",
 		  CFG_NAPI_NAME, pHddCtx->config->napi_enable);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Name = [%s] Value = [%u]",
 		  CFG_CE_CLASSIFY_ENABLE_NAME,
 		  pHddCtx->config->ce_classify_enabled);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "Name = [%s] value = [%u]",
 		  CFG_DUAL_MAC_FEATURE_DISABLE,
 		  pHddCtx->config->dual_mac_feature_disable);
@@ -5259,13 +5259,13 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx)
 	status = request_firmware(&fw, WLAN_MAC_FILE, pHddCtx->parent_dev);
 
 	if (status) {
-		hddLog(CDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d",
+		hddLog(QDF_TRACE_LEVEL_WARN, "%s: request_firmware failed %d",
 		       __func__, status);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		return qdf_status;
 	}
 	if (!fw || !fw->data || !fw->size) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: invalid firmware", __func__);
 		qdf_status = QDF_STATUS_E_INVAL;
 		goto config_exit;
 	}
@@ -5307,10 +5307,10 @@ QDF_STATUS hdd_update_mac_config(hdd_context_t *pHddCtx)
 		buffer = line;
 	}
 	if (i <= QDF_MAX_CONCURRENCY_PERSONA) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided",
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: %d Mac addresses provided",
 		       __func__, i);
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: invalid number of Mac address provided, nMac = %d",
 		       __func__, i);
 		qdf_status = QDF_STATUS_E_INVAL;
@@ -5356,13 +5356,13 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx)
 	status = request_firmware(&fw, WLAN_INI_FILE, pHddCtx->parent_dev);
 
 	if (status) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: request_firmware failed %d",
 		       __func__, status);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		goto config_exit;
 	}
 	if (!fw || !fw->data || !fw->size) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: %s download failed",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: %s download failed",
 		       __func__, WLAN_INI_FILE);
 		qdf_status = QDF_STATUS_E_FAILURE;
 		goto config_exit;
@@ -5373,7 +5373,7 @@ QDF_STATUS hdd_parse_config_ini(hdd_context_t *pHddCtx)
 	buffer = (char *)cdf_mem_malloc(fw->size);
 
 	if (NULL == buffer) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("cdf_mem_malloc failure"));
 		release_firmware(fw);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -6045,7 +6045,7 @@ bool hdd_update_config_dat(hdd_context_t *pHddCtx)
 		temp = (temp & 0xFFFC) | pConfig->vhtTxMCS;
 		if (pConfig->enable2x2)
 			temp = (temp & 0xFFF3) | (pConfig->vhtTxMCS2x2 << 2);
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "vhtRxMCS2x2 - %x temp - %u enable2x2 %d",
 			  pConfig->vhtRxMCS2x2, temp,
 			  pConfig->enable2x2);
@@ -6381,13 +6381,13 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
 
 	smeConfig = cdf_mem_malloc(sizeof(*smeConfig));
 	if (NULL == smeConfig) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: unable to allocate smeConfig", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
 	cdf_mem_zero(smeConfig, sizeof(*smeConfig));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s bWmmIsEnabled=%d 802_11e_enabled=%d dot11Mode=%d",
 		  __func__, pConfig->WmmMode, pConfig->b80211eIsEnabled,
 		  pConfig->dot11Mode);
@@ -6724,7 +6724,7 @@ QDF_STATUS hdd_cfg_get_global_config(hdd_context_t *pHddCtx, char *pBuf,
 bool hdd_is_okc_mode_enabled(hdd_context_t *pHddCtx)
 {
 	if (NULL == pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: pHddCtx is NULL", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: pHddCtx is NULL", __func__);
 		return -EINVAL;
 	}
 #ifdef FEATURE_WLAN_OKC
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 960c073fa85f..bfa18537c8d1 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -41,7 +41,7 @@
 #include <wlan_hdd_includes.h>
 #include <net/arp.h>
 #include <net/cfg80211.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #ifdef CONFIG_CNSS
 #include <net/cnss.h>
 #endif
@@ -61,7 +61,7 @@
 #include "wlan_hdd_power.h"
 #include "wlan_hdd_trace.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_utils.h"
 #include "cds_sched.h"
 #include "wlan_hdd_scan.h"
@@ -1434,12 +1434,12 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 	status = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_ACS_MAX, data, data_len,
 						NULL);
 	if (status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
 		goto out;
 	}
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_ACS_HW_MODE]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Attr hw_mode failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Attr hw_mode failed"));
 		goto out;
 	}
 	sap_config->acs_cfg.hw_mode = nla_get_u8(
@@ -1978,7 +1978,7 @@ __wlan_hdd_cfg80211_set_scanning_mac_oui(struct wiphy *wiphy,
 	       pReqMsg->oui[1], pReqMsg->oui[2]);
 	status = sme_set_scanning_mac_oui(pHddCtx->hHal, pReqMsg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_set_scanning_mac_oui failed(err=%d)"), status);
 		goto fail;
 	}
@@ -2218,8 +2218,8 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 	}
 	req_id = nla_get_u32(
 		tb[QCA_WLAN_VENDOR_ATTR_ROAMING_REQ_ID]);
-	hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Req Id (%d)"), req_id);
-	hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Cmd Type (%d)"), cmd_type);
+	hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Req Id (%d)"), req_id);
+	hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Cmd Type (%d)"), cmd_type);
 	switch (cmd_type) {
 	case QCA_WLAN_VENDOR_ATTR_ROAM_SUBCMD_SSID_WHITE_LIST:
 		i = 0;
@@ -2254,7 +2254,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 					buf_len - 1);
 				roam_params.ssid_allowed_list[i].length =
 					buf_len - 1;
-				hddLog(CDF_TRACE_LEVEL_DEBUG,
+				hddLog(QDF_TRACE_LEVEL_DEBUG,
 					FL("SSID[%d]: %.*s,length = %d"), i,
 					roam_params.ssid_allowed_list[i].length,
 					roam_params.ssid_allowed_list[i].ssId,
@@ -2265,7 +2265,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 			}
 		}
 		roam_params.num_ssid_allowed_list = i;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of Allowed SSID %d"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of Allowed SSID %d"),
 			roam_params.num_ssid_allowed_list);
 		sme_update_roam_params(pHddCtx->hHal, session_id,
 				roam_params, REASON_ROAM_SET_SSID_ALLOWED);
@@ -2278,7 +2278,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.raise_rssi_thresh_5g = nla_get_s32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_THRESHOLD]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Boost Threshold (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Boost Threshold (%d)"),
 			roam_params.raise_rssi_thresh_5g);
 		/* Parse and fetch 5G Penalty Threshold */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_THRESHOLD]) {
@@ -2287,7 +2287,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.drop_rssi_thresh_5g = nla_get_s32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_THRESHOLD]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Penalty Threshold (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Penalty Threshold (%d)"),
 			roam_params.drop_rssi_thresh_5g);
 		/* Parse and fetch 5G Boost Factor */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_FACTOR]) {
@@ -2296,7 +2296,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.raise_factor_5g = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_BOOST_FACTOR]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Boost Factor (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Boost Factor (%d)"),
 			roam_params.raise_factor_5g);
 		/* Parse and fetch 5G Penalty factor */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_FACTOR]) {
@@ -2305,7 +2305,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.drop_factor_5g = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_PENALTY_FACTOR]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Penalty factor (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Penalty factor (%d)"),
 			roam_params.drop_factor_5g);
 		/* Parse and fetch 5G Max Boost */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_MAX_BOOST]) {
@@ -2314,7 +2314,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.max_raise_rssi_5g = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_A_BAND_MAX_BOOST]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("5G Max Boost (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("5G Max Boost (%d)"),
 			roam_params.max_raise_rssi_5g);
 		/* Parse and fetch Rssi Diff */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_LAZY_ROAM_HISTERESYS]) {
@@ -2323,7 +2323,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.rssi_diff = nla_get_s32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_LAZY_ROAM_HISTERESYS]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("RSSI Diff (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("RSSI Diff (%d)"),
 			roam_params.rssi_diff);
 		/* Parse and fetch Alert Rssi Threshold */
 		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_ALERT_ROAM_RSSI_TRIGGER]) {
@@ -2332,7 +2332,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.alert_rssi_threshold = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_ALERT_ROAM_RSSI_TRIGGER]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Alert RSSI Threshold (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Alert RSSI Threshold (%d)"),
 			roam_params.alert_rssi_threshold);
 		sme_update_roam_params(pHddCtx->hHal, session_id,
 			roam_params,
@@ -2346,7 +2346,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.good_rssi_roam = nla_get_s32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_ENABLE]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Activate Good Rssi Roam (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Activate Good Rssi Roam (%d)"),
 			roam_params.good_rssi_roam);
 		sme_update_roam_params(pHddCtx->hHal, session_id,
 			roam_params, REASON_ROAM_GOOD_RSSI_CHANGED);
@@ -2359,7 +2359,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.num_bssid_favored = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_NUM_BSSID]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of Preferred BSSID (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of Preferred BSSID (%d)"),
 			roam_params.num_bssid_favored);
 		i = 0;
 		nla_for_each_nested(curr_attr,
@@ -2389,7 +2389,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 			}
 			roam_params.bssid_favored_factor[i] = nla_get_u32(
 				tb2[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_LAZY_ROAM_RSSI_MODIFIER]);
-			hddLog(CDF_TRACE_LEVEL_DEBUG, FL("BSSID Preference score (%d)"),
+			hddLog(QDF_TRACE_LEVEL_DEBUG, FL("BSSID Preference score (%d)"),
 				roam_params.bssid_favored_factor[i]);
 			i++;
 		}
@@ -2404,7 +2404,7 @@ __wlan_hdd_cfg80211_set_ext_roam_params(struct wiphy *wiphy,
 		}
 		roam_params.num_bssid_avoid_list = nla_get_u32(
 			tb[QCA_WLAN_VENDOR_ATTR_ROAMING_PARAM_SET_BSSID_PARAMS_NUM_BSSID]);
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Num of blacklist BSSID (%d)"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Num of blacklist BSSID (%d)"),
 			roam_params.num_bssid_avoid_list);
 		i = 0;
 		nla_for_each_nested(curr_attr,
@@ -2507,7 +2507,7 @@ static bool wlan_hdd_check_dfs_channel_for_adapter(hdd_context_t *hdd_ctx,
 			if (CHANNEL_STATE_DFS ==
 			    cds_get_channel_state(
 				    ap_ctx->operatingChannel)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("SAP running on DFS channel"));
 				return true;
 			}
@@ -2603,7 +2603,7 @@ int wlan_hdd_disable_dfs_chan_scan(hdd_context_t *hdd_ctx,
 		}
 
 	} else {
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL(" the DFS flag has not changed"));
 		ret_val = 0;
 	}
@@ -3001,7 +3001,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 	ENTER();
 
 	if (wlan_hdd_validate_context(hdd_ctx_ptr)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid "));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid "));
 		return -EINVAL;
 	}
 
@@ -3019,7 +3019,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 			GFP_KERNEL);
 
 	if (!skb) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 				FL("cfg80211_vendor_event_alloc failed"));
 		return -EINVAL;
 	}
@@ -3030,14 +3030,14 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 				req_rsn_len, req_rsn_ie) ||
 			nla_put(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_RESP_IE,
 				rsp_rsn_len, rsp_rsn_ie)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
 		goto nla_put_failure;
 	}
-	hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Auth Status = %d"),
+	hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Auth Status = %d"),
 			roam_info_ptr->synchAuthStatus);
 	if (roam_info_ptr->synchAuthStatus ==
 			CSR_ROAM_AUTH_STATUS_AUTHENTICATED) {
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Include Auth Params TLV's"));
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Include Auth Params TLV's"));
 		if (nla_put_u8(skb,
 			QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_AUTHORIZED, true)) {
 			hdd_err("nla put fail");
@@ -3064,15 +3064,15 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 			goto nla_put_failure;
 		}
 	} else {
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("No Auth Params TLV's"));
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("No Auth Params TLV's"));
 		if (nla_put_u8(skb, QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_AUTHORIZED,
 					false)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
+			hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
 			goto nla_put_failure;
 		}
 	}
 
-	hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Subnet Change Status = %d"),
+	hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Subnet Change Status = %d"),
 		roam_info_ptr->subnet_change_status);
 
 	/*
@@ -3085,7 +3085,7 @@ int wlan_hdd_send_roam_auth_event(hdd_context_t *hdd_ctx_ptr, uint8_t *bssid,
 		if (nla_put_u8(skb,
 				QCA_WLAN_VENDOR_ATTR_ROAM_AUTH_SUBNET_STATUS,
 				roam_info_ptr->subnet_change_status)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
+			hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
 			goto nla_put_failure;
 		}
 	}
@@ -4337,12 +4337,12 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 
 	if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_MAX, data, data_len,
 		      qca_wlan_vendor_attr_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid attribute"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid attribute"));
 		return -EINVAL;
 	}
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Attribute peerMac not provided for mode=%d"),
 		       adapter->device_mode);
 		return -EINVAL;
@@ -4350,7 +4350,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 
 	cdf_mem_copy(peer_mac, nla_data(tb[QCA_WLAN_VENDOR_ATTR_MAC_ADDR]),
 		     QDF_MAC_ADDR_SIZE);
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       FL("peerMac="MAC_ADDRESS_STR" for device_mode:%d"),
 	       MAC_ADDR_ARRAY(peer_mac), adapter->device_mode);
 
@@ -4361,7 +4361,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 			eConnectionState_Associated) ||
 		    !cdf_mem_compare(hdd_sta_ctx->conn_info.bssId.bytes,
 			peer_mac, QDF_MAC_ADDR_SIZE)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("Not Associated to mac "MAC_ADDRESS_STR),
 			       MAC_ADDR_ARRAY(peer_mac));
 			return -EINVAL;
@@ -4385,7 +4385,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		}
 
 		if (WLAN_MAX_STA_COUNT == sta_id) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("No active peer with mac="MAC_ADDRESS_STR),
 			       MAC_ADDR_ARRAY(peer_mac));
 			return -EINVAL;
@@ -4396,7 +4396,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 			(WLAN_HDD_GET_AP_CTX_PTR(adapter))->operatingChannel);
 		rate_flags = adapter->aStaInfo[sta_id].rate_flags;
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Not Associated! with mac "MAC_ADDRESS_STR),
 		       MAC_ADDR_ARRAY(peer_mac));
 		return -EINVAL;
@@ -4430,7 +4430,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 			sizeof(u8) + sizeof(u8) + sizeof(u32) + NLMSG_HDRLEN);
 
 	if (NULL == reply_skb) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("getLinkProperties: skb alloc failed"));
 		return -EINVAL;
 	}
@@ -4444,7 +4444,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	    nla_put_u32(reply_skb,
 		QCA_WLAN_VENDOR_ATTR_LINK_PROPERTIES_FREQ,
 		freq)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla_put failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla_put failed"));
 		kfree_skb(reply_skb);
 		return -EINVAL;
 	}
@@ -5517,7 +5517,7 @@ int wlan_hdd_cfg80211_register(struct wiphy *wiphy)
 	/* Register our wiphy dev with cfg80211 */
 	if (0 > wiphy_register(wiphy)) {
 		/* print error */
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: wiphy register failed",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: wiphy register failed",
 		       __func__);
 		return -EIO;
 	}
@@ -5689,10 +5689,10 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index,
 	pKeyPtr = setKey.Key;
 	memcpy(pKeyPtr, key, key_Len);
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "%s: WAPI KEY LENGTH:0x%04x",
+	hddLog(QDF_TRACE_LEVEL_INFO, "%s: WAPI KEY LENGTH:0x%04x",
 	       __func__, key_Len);
 	for (n = 0; n < key_Len; n++)
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s WAPI KEY Data[%d]:%02x ",
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s WAPI KEY Data[%d]:%02x ",
 		       __func__, n, setKey.Key[n]);
 
 	pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_SETTING_KEY;
@@ -5701,7 +5701,7 @@ void wlan_hdd_cfg80211_set_key_wapi(hdd_adapter_t *pAdapter, uint8_t key_index,
 					  pAdapter->sessionId, &setKey, &roamId);
 	}
 	if (status != 0) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "[%4d] sme_roam_set_key returned ERROR status= %d",
 			  __LINE__, status);
 		pHddStaCtx->roam_info.roamingState = HDD_ROAM_STATE_NONE;
@@ -5721,7 +5721,7 @@ uint8_t *wlan_hdd_cfg80211_get_ie_ptr(const uint8_t *ies_ptr, int length,
 		elem_len = ptr[1];
 		left -= 2;
 		if (elem_len > left) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("Invalid IEs eid = %d elem_len=%d left=%d"),
 			       eid, elem_len, left);
 			return NULL;
@@ -5765,14 +5765,14 @@ QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter,
 			}
 		}
 		if (fValidChannel != true) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Invalid Channel [%d]", __func__, channel);
 			return QDF_STATUS_E_FAILURE;
 		}
 	} else {
 		if (0 != sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST,
 					 valid_ch, &num_ch)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: failed to get valid channel list",
 			       __func__);
 			return QDF_STATUS_E_FAILURE;
@@ -5784,7 +5784,7 @@ QDF_STATUS wlan_hdd_validate_operation_channel(hdd_adapter_t *pAdapter,
 		}
 
 		if (indx >= num_ch) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Invalid Channel [%d]", __func__, channel);
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -5804,7 +5804,7 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter)
 	uint32_t temp;
 	pDhcpSrvInfo = cdf_mem_malloc(sizeof(*pDhcpSrvInfo));
 	if (NULL == pDhcpSrvInfo) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: could not allocate tDhcpSrvOffloadInfo!", __func__);
 		return;
 	}
@@ -5815,19 +5815,19 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter)
 	hdd_string_to_u8_array(pHddCtx->config->dhcpServerIP,
 			       srv_ip, &numEntries, IPADDR_NUM_ENTRIES);
 	if (numEntries != IPADDR_NUM_ENTRIES) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: incorrect IP address (%s) assigned for DHCP server!",
 		       __func__, pHddCtx->config->dhcpServerIP);
 		goto end;
 	}
 	if ((srv_ip[0] >= 224) && (srv_ip[0] <= 239)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: invalid IP address (%s)! It could NOT be multicast IP address!",
 		       __func__, pHddCtx->config->dhcpServerIP);
 		goto end;
 	}
 	if (srv_ip[IPADDR_NUM_ENTRIES - 1] >= 100) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: invalid IP address (%s)! The last field must be less than 100!",
 		       __func__, pHddCtx->config->dhcpServerIP);
 		goto end;
@@ -5838,11 +5838,11 @@ static void wlan_hdd_set_dhcp_server_offload(hdd_adapter_t *pHostapdAdapter)
 	}
 	if (QDF_STATUS_SUCCESS !=
 	    sme_set_dhcp_srv_offload(pHddCtx->hHal, pDhcpSrvInfo)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: sme_setDHCPSrvOffload fail!", __func__);
 		goto end;
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       "%s: enable DHCP Server offload successfully!", __func__);
 end:
 	cdf_mem_free(pDhcpSrvInfo);
@@ -5866,7 +5866,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BSS,
 			 pAdapter->sessionId, params->ap_isolate));
 	hddLog(LOG1, FL("Device_mode %s(%d), ap_isolate = %d"),
@@ -6026,17 +6026,17 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 	if (0 != status)
 		return status;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_IFACE,
 			 pAdapter->sessionId, type));
 
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Device_mode = %d, IFTYPE = 0x%x"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Device_mode = %d, IFTYPE = 0x%x"),
 	       pAdapter->device_mode, type);
 
 	if (!cds_allow_concurrency(
 				wlan_hdd_convert_nl_iftype_to_hdd_type(type),
 				0, HW_MODE_20_MHZ)) {
-		hddLog(CDF_TRACE_LEVEL_DEBUG,
+		hddLog(QDF_TRACE_LEVEL_DEBUG,
 			FL("This concurrency combination is not allowed"));
 		return -EINVAL;
 	}
@@ -6083,7 +6083,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 		case NL80211_IFTYPE_AP:
 		case NL80211_IFTYPE_P2P_GO:
 		{
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 			       FL("Setting interface Type to %s"),
 			       (type ==
 				NL80211_IFTYPE_AP) ? "SoftAP" :
@@ -6316,7 +6316,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CHANGE_STATION,
 			 pAdapter->sessionId, params->listen_interval));
 
@@ -6338,7 +6338,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 							    ol_txrx_peer_state_auth);
 
 			if (status != QDF_STATUS_SUCCESS) {
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       FL
 					       ("Not able to change TL state to AUTHENTICATED"));
 				return -EINVAL;
@@ -6358,7 +6358,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 			 * are an incremental of 1 else an incremental of 4 till the number
 			 * of channels.
 			 */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: params->supported_channels_len: %d",
 				  __func__, params->supported_channels_len);
 			if (0 != params->supported_channels_len) {
@@ -6385,8 +6385,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					no_of_channels =
 						params->supported_channels[i + 1];
 
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_INFO,
 						  "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d, wifi_chan_index: %d, no_of_channels: %d",
 						  __func__, i, j, k, j,
 						  StaParams.
@@ -6409,8 +6409,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 						} else {
 							continue;
 						}
-						CDF_TRACE(QDF_MODULE_ID_HDD,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_HDD,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s: i: %d, j: %d, k: %d, StaParams.supported_channels[%d]: %d",
 							  __func__, i, j, k,
 							  j + 1,
@@ -6421,12 +6421,12 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					}
 				}
 				num_unique_channels = j + 1;
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Unique Channel List", __func__);
 				for (i = 0; i < num_unique_channels; i++) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_INFO,
 						  "%s: StaParams.supported_channels[%d]: %d,",
 						  __func__, i,
 						  StaParams.
@@ -6436,8 +6436,8 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 					num_unique_channels = MAX_CHANNEL;
 				StaParams.supported_channels_len =
 					num_unique_channels;
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: After removing duplcates StaParams.supported_channels_len: %d",
 					  __func__,
 					  StaParams.supported_channels_len);
@@ -6480,14 +6480,14 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 				cdf_mem_copy(StaParams.supported_rates,
 					     params->supported_rates,
 					     StaParams.supported_rates_len);
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "Supported Rates with Length %d",
 					  StaParams.supported_rates_len);
 				for (i = 0; i < StaParams.supported_rates_len;
 				     i++)
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_INFO,
 						  "[%d]: %0x", i,
 						  StaParams.supported_rates[i]);
 			}
@@ -6515,7 +6515,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 							     isBufSta,
 							     isOffChannelSupported);
 			if (QDF_STATUS_SUCCESS != status) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL
 					       ("wlan_hdd_tdls_set_peer_caps failed!"));
 				return -EINVAL;
@@ -6525,7 +6525,7 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
 				wlan_hdd_tdls_add_station(wiphy, dev, mac, 1,
 							  &StaParams);
 			if (QDF_STATUS_SUCCESS != status) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("wlan_hdd_tdls_add_station failed!"));
 				return -EINVAL;
 			}
@@ -6599,7 +6599,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_ADD_KEY,
 			 pAdapter->sessionId, params->key_len));
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
@@ -6613,20 +6613,20 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		pAdapter->device_mode);
 
 	if (CSR_MAX_NUM_KEY <= key_index) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid key index %d",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid key index %d",
 		       __func__, key_index);
 
 		return -EINVAL;
 	}
 
 	if (CSR_MAX_KEY_LEN < params->key_len) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid key length %d",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid key length %d",
 		       __func__, params->key_len);
 
 		return -EINVAL;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "%s: called with key index = %d & key length %d",
 	       __func__, key_index, params->key_len);
 
@@ -6712,23 +6712,23 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 #endif
 
 	default:
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: unsupported cipher type %u",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: unsupported cipher type %u",
 		       __func__, params->cipher);
 		return -EOPNOTSUPP;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO_MED, "%s: encryption type %d",
+	hddLog(QDF_TRACE_LEVEL_INFO_MED, "%s: encryption type %d",
 	       __func__, setKey.encType);
 
 	if (!pairwise) {
 		/* set group key */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s- %d: setting Broadcast key", __func__, __LINE__);
 		setKey.keyDirection = eSIR_RX_ONLY;
 		qdf_set_macaddr_broadcast(&setKey.peerMac);
 	} else {
 		/* set pairwise key */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s- %d: setting pairwise key", __func__, __LINE__);
 		setKey.keyDirection = eSIR_TX_RX;
 		cdf_mem_copy(setKey.peerMac.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
@@ -6736,7 +6736,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 	if ((WLAN_HDD_IBSS == pAdapter->device_mode) && !pairwise) {
 		/* if a key is already installed, block all subsequent ones */
 		if (pAdapter->sessionCtx.station.ibss_enc_key_installed) {
-			hddLog(CDF_TRACE_LEVEL_INFO_MED,
+			hddLog(QDF_TRACE_LEVEL_INFO_MED,
 			       "%s: IBSS key installed already", __func__);
 			return 0;
 		}
@@ -6747,7 +6747,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 					  pAdapter->sessionId, &setKey, &roamId);
 
 		if (0 != status) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: sme_roam_set_key failed, returned %d",
 			       __func__, status);
 			return -EINVAL;
@@ -6772,8 +6772,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 			status = wlansap_set_key_sta(p_cds_context, &setKey);
 #endif
 			if (status != QDF_STATUS_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "[%4d] wlansap_set_key_sta returned ERROR status= %d",
 					  __LINE__, status);
 			}
@@ -6799,8 +6799,8 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		if (!pairwise) {
 			/* set group key */
 			if (pHddStaCtx->roam_info.deferKeyComplete) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s- %d: Perform Set key Complete",
 					  __func__, __LINE__);
 				hdd_perform_roam_set_key_complete(pAdapter);
@@ -6829,11 +6829,11 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 		cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
 						   pAdapter->sessionId, &setKey);
 		if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
-			hddLog(CDF_TRACE_LEVEL_INFO_MED,
+			hddLog(QDF_TRACE_LEVEL_INFO_MED,
 			       "%s: Update PreAuth Key success", __func__);
 			return 0;
 		} else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Update PreAuth Key failed", __func__);
 			return -EINVAL;
 		}
@@ -6843,7 +6843,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 					  pAdapter->sessionId, &setKey, &roamId);
 
 		if (0 != status) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: sme_roam_set_key failed, returned %d",
 			       __func__, status);
 			pHddStaCtx->roam_info.roamingState =
@@ -6879,7 +6879,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 						  &roamId);
 
 			if (0 != status) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       "%s: sme_roam_set_key failed for group key (IBSS), returned %d",
 				       __func__, status);
 				pHddStaCtx->roam_info.roamingState =
@@ -6938,7 +6938,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 	memset(&params, 0, sizeof(params));
 
 	if (CSR_MAX_NUM_KEY <= key_index) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("invalid key index %d"),
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("invalid key index %d"),
 		       key_index);
 		return -EINVAL;
 	}
@@ -6971,7 +6971,7 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
 		break;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_KEY,
 			 pAdapter->sessionId, params.cipher));
 
@@ -7083,7 +7083,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_DEFAULT_KEY,
 			 pAdapter->sessionId, key_index));
 
@@ -7494,7 +7494,7 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
 
 	ENTER();
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_UPDATE_BSS,
 			 NO_SESSION, pAdapter->sessionId));
 
@@ -8314,7 +8314,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				    (pWextState->assocAddIE.length + eLen)) {
 					hddLog(LOGE,
 					       FL("Cannot accommodate assocAddIE. Need bigger buffer space"));
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 				/* WSC IE is saved to Additional IE ; it should be accumulated to handle WPS IE + P2P IE */
@@ -8348,7 +8348,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				    (pWextState->assocAddIE.length + eLen)) {
 					hddLog(LOGE,
 					       FL("Cannot accommodate assocAddIE Need bigger buffer space"));
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 				/* P2P IE is saved to Additional IE ; it should be accumulated to handle WPS IE + P2P IE */
@@ -8376,7 +8376,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				    (pWextState->assocAddIE.length + eLen)) {
 					hddLog(LOGE,
 						FL("Cannot accommodate assocAddIE Need bigger buffer space"));
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 				/* WFD IE is saved to Additional IE ; it should
@@ -8404,7 +8404,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				    (pWextState->assocAddIE.length + eLen)) {
 					hddLog(LOGE,
 					       FL("Cannot accommodate assocAddIE Need bigger buffer space"));
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 				memcpy(pWextState->assocAddIE.addIEdata +
@@ -8428,7 +8428,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				    (pWextState->assocAddIE.length + eLen)) {
 					hddLog(LOGE,
 					       FL("Cannot accommodate assocAddIE Need bigger buffer space"));
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 				memcpy(pWextState->assocAddIE.addIEdata +
@@ -8449,7 +8449,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 				if (SIR_MAC_MAX_ADD_IE_LENGTH <
 				    (pWextState->assocAddIE.length + eLen)) {
 					hdd_err("Cannot accommodate assocAddIE Need bigger buffer space");
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					return -ENOMEM;
 				}
 
@@ -8493,7 +8493,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 			if (SIR_MAC_MAX_ADD_IE_LENGTH <
 			    (pWextState->assocAddIE.length + eLen)) {
 				hddLog(LOGE, FL("Cannot accommodate assocAddIE Need bigger buffer space"));
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 				return -ENOMEM;
 			}
 			memcpy(pWextState->assocAddIE.addIEdata +
@@ -8522,7 +8522,7 @@ int wlan_hdd_cfg80211_set_ie(hdd_adapter_t *pAdapter, const uint8_t *ie,
 			} else {
 				hddLog(LOGE,
 				       FL("Invalid akmSuite count"));
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 				return -EINVAL;
 			}
 
@@ -8575,7 +8575,7 @@ static bool hdd_is_wpaie_present(const uint8_t *ie, uint8_t ie_len)
 		eLen = *ie++;
 		remLen -= 2;
 		if (eLen > remLen) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: IE length is wrong %d", __func__, eLen);
 			return false;
 		}
@@ -8822,7 +8822,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CONNECT,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9085,7 +9085,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DISCONNECT,
 			 pAdapter->sessionId, reason));
 	hddLog(LOG1, FL("Device_mode %s(%d) reason code(%d)"),
@@ -9319,7 +9319,7 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_JOIN_IBSS,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -9529,7 +9529,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_LEAVE_IBSS,
 			 pAdapter->sessionId,
 			 eCSR_DISCONNECT_REASON_IBSS_LEAVE));
@@ -9626,7 +9626,7 @@ static int __wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_WIPHY_PARAMS,
 			 NO_SESSION, wiphy->rts_threshold));
 	status = wlan_hdd_validate_context(pHddCtx);
@@ -9842,7 +9842,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DEL_STA,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -10062,7 +10062,7 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_ADD_STA,
 			 pAdapter->sessionId, params->listen_interval));
 
@@ -10169,7 +10169,7 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
 	result = sme_roam_set_pmkid_cache(halHandle, pAdapter->sessionId,
 					  &pmk_id, 1, false);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_PMKSA,
 			 pAdapter->sessionId, result));
 
@@ -10232,7 +10232,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_DEBUG, FL("Deleting PMKSA for " MAC_ADDRESS_STR),
+	hddLog(QDF_TRACE_LEVEL_DEBUG, FL("Deleting PMKSA for " MAC_ADDRESS_STR),
 	       MAC_ADDR_ARRAY(pmksa->bssid));
 
 	status = wlan_hdd_validate_context(pHddCtx);
@@ -10242,7 +10242,7 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
 
 	halHandle = WLAN_HDD_GET_HAL_CTX(pAdapter);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DEL_PMKSA,
 			 pAdapter->sessionId, 0));
 	/* Delete the PMKID CSR cache */
@@ -10373,7 +10373,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES,
 			 pAdapter->sessionId, pHddStaCtx->conn_info.connState));
 	/* Added for debug on reception of Re-assoc Req. */
@@ -10504,7 +10504,7 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_REKEY_DATA,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -10638,7 +10638,7 @@ static int __wlan_hdd_cfg80211_set_mac_acl(struct wiphy *wiphy,
 	hddLog(LOGE, "acl policy: = %d no acl entries = %d", params->acl_policy,
 		params->n_acl_entries);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_MAC_ACL,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	if (WLAN_HDD_SOFTAP == pAdapter->device_mode) {
@@ -10824,7 +10824,7 @@ static int __wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TESTMODE,
 			 NO_SESSION, nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])));
 	switch (nla_get_u32(tb[WLAN_HDD_TM_ATTR_CMD])) {
@@ -10945,7 +10945,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 	hdd_context_t *hdd_ctx;
 
 	if (!buf || !buf_len) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: buf or buf_len invalid, buf = %p buf_len = %zu",
 			  __func__, buf, buf_len);
 		return;
@@ -10953,7 +10953,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: hdd context invalid", __func__);
 		return;
 	}
@@ -10961,7 +10961,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 	skb = cfg80211_testmode_alloc_event_skb(hdd_ctx->wiphy,
 						buf_len, GFP_KERNEL);
 	if (!skb) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to allocate testmode rx skb!", __func__);
 		return;
 	}
@@ -10977,7 +10977,7 @@ void wlan_hdd_testmode_rx_event(void *buf, size_t buf_len)
 
 nla_put_failure:
 	kfree_skb(skb);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		  "%s: nla_put failed on testmode rx skb!", __func__);
 }
 #endif
diff --git a/core/hdd/src/wlan_hdd_conc_ut.c b/core/hdd/src/wlan_hdd_conc_ut.c
index 69d1b13ee5a6..1a9354eab607 100644
--- a/core/hdd/src/wlan_hdd_conc_ut.c
+++ b/core/hdd/src/wlan_hdd_conc_ut.c
@@ -36,7 +36,7 @@
 #include "cds_concurrency.h"
 #include "wlan_hdd_conc_ut.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_utils.h"
 #include "cds_reg_service.h"
 #include "wma_types.h"
diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c
index eb56cb09e540..80a18ddf7f6a 100644
--- a/core/hdd/src/wlan_hdd_debugfs.c
+++ b/core/hdd/src/wlan_hdd_debugfs.c
@@ -69,7 +69,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 
 	pAdapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -83,7 +83,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 
 
 	if (!sme_is_feature_supported_by_fw(WOW)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Wake-on-Wireless feature is not supported in firmware!",
 			  __func__);
 
@@ -91,7 +91,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 	}
 
 	if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE);
 
@@ -114,7 +114,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 	/* Disable wow */
 	if (!wow_enable) {
 		if (!hdd_exit_wowl(pAdapter)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: hdd_exit_wowl failed!", __func__);
 
 			return -EFAULT;
@@ -142,7 +142,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file,
 		wow_pbm = 1;
 
 	if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: hdd_enter_wowl failed!", __func__);
 
 		return -EFAULT;
@@ -199,7 +199,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 	ENTER();
 
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -212,7 +212,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 		return ret;
 
 	if (!sme_is_feature_supported_by_fw(WOW)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Wake-on-Wireless feature is not supported in firmware!",
 			  __func__);
 
@@ -220,7 +220,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file,
 	}
 
 	if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN);
 
@@ -328,7 +328,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	pAdapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 
@@ -341,7 +341,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		return ret;
 
 	if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Periodic Tx Pattern Offload feature is not supported in firmware!",
 			  __func__);
 		return -EINVAL;
@@ -351,7 +351,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	if (count <= MAX_USER_COMMAND_SIZE_FRAME)
 		cmd = cdf_mem_malloc(count + 1);
 	else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Command length is larger than %d bytes.",
 			  __func__, MAX_USER_COMMAND_SIZE_FRAME);
 
@@ -359,7 +359,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	}
 
 	if (!cmd) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("Memory allocation for cmd failed!"));
 		return -ENOMEM;
 	}
@@ -379,7 +379,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		goto failure;
 
 	if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Pattern index %d is not in the range (0 ~ %d).",
 			  __func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1);
 
@@ -398,7 +398,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		delPeriodicTxPtrnParams =
 			cdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn));
 		if (!delPeriodicTxPtrnParams) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  FL("Memory allocation failed!"));
 			cdf_mem_free(cmd);
 			return -ENOMEM;
@@ -412,7 +412,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		status = sme_del_periodic_tx_ptrn(pHddCtx->hHal,
 						  delPeriodicTxPtrnParams);
 		if (QDF_STATUS_SUCCESS != status) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: sme_del_periodic_tx_ptrn() failed!",
 				  __func__);
 
@@ -432,7 +432,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	hdd_info("device mode %d", pAdapter->device_mode);
 	if ((WLAN_HDD_INFRA_STATION == pAdapter->device_mode) &&
 	    (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				"%s: Not in Connected state!", __func__);
 			goto failure;
 	}
@@ -448,7 +448,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	/* Since the pattern is a hex string, 2 characters represent 1 byte. */
 	if (pattern_len % 2) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Malformed pattern!", __func__);
 
 		goto failure;
@@ -456,7 +456,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		pattern_len >>= 1;
 
 	if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not an 802.3 frame!", __func__);
 
 		goto failure;
@@ -464,7 +464,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 
 	addPeriodicTxPtrnParams = cdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn));
 	if (!addPeriodicTxPtrnParams) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("Memory allocation failed!"));
 		cdf_mem_free(cmd);
 		return -ENOMEM;
@@ -490,7 +490,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	status = sme_add_periodic_tx_ptrn(pHddCtx->hHal,
 					  addPeriodicTxPtrnParams);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_add_periodic_tx_ptrn() failed!", __func__);
 
 		cdf_mem_free(addPeriodicTxPtrnParams);
@@ -548,7 +548,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file)
 
 	adapter = (hdd_adapter_t *)file->private_data;
 	if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Invalid adapter or adapter has invalid magic.",
 			  __func__);
 		return -EINVAL;
diff --git a/core/hdd/src/wlan_hdd_driver_ops.c b/core/hdd/src/wlan_hdd_driver_ops.c
index 1face696b292..8b674b9358a9 100644
--- a/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/core/hdd/src/wlan_hdd_driver_ops.c
@@ -581,10 +581,10 @@ static int __wlan_hdd_bus_suspend(pm_message_t state)
 
 resume_wma:
 	status = wma_bus_resume();
-	CDF_BUG(!status);
+	QDF_BUG(!status);
 resume_oltxrx:
 	status = ol_txrx_bus_resume();
-	CDF_BUG(!status);
+	QDF_BUG(!status);
 done:
 	hdd_err("suspend done, status = %d", err);
 	return err;
@@ -636,13 +636,13 @@ static int __wlan_hdd_bus_resume(void)
 	}
 
 	status = hif_bus_resume(hif_ctx);
-	CDF_BUG(!status);
+	QDF_BUG(!status);
 
 	status = wma_bus_resume();
-	CDF_BUG(!status);
+	QDF_BUG(!status);
 
 	status = ol_txrx_bus_resume();
-	CDF_BUG(!status);
+	QDF_BUG(!status);
 
 	hdd_info("resume done");
 	return status;
@@ -710,11 +710,11 @@ static int __wlan_hdd_runtime_suspend(void)
 	return status;
 
 resume_hif:
-	CDF_BUG(!hif_runtime_resume(hif_ctx));
+	QDF_BUG(!hif_runtime_resume(hif_ctx));
 resume_wma:
-	CDF_BUG(!wma_runtime_resume());
+	QDF_BUG(!wma_runtime_resume());
 resume_htc:
-	CDF_BUG(!htc_runtime_resume());
+	QDF_BUG(!htc_runtime_resume());
 process_failure:
 	hif_process_runtime_suspend_failure(hif_ctx);
 	return status;
@@ -753,10 +753,10 @@ static int __wlan_hdd_runtime_resume(void)
 	void *hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 
 	hif_pre_runtime_resume(hif_ctx);
-	CDF_BUG(!cnss_auto_resume());
-	CDF_BUG(!hif_runtime_resume(hif_ctx));
-	CDF_BUG(!wma_runtime_resume());
-	CDF_BUG(!htc_runtime_resume());
+	QDF_BUG(!cnss_auto_resume());
+	QDF_BUG(!hif_runtime_resume(hif_ctx));
+	QDF_BUG(!wma_runtime_resume());
+	QDF_BUG(!htc_runtime_resume());
 	hif_process_runtime_resume_success(hif_ctx);
 	return 0;
 }
diff --git a/core/hdd/src/wlan_hdd_ftm.c b/core/hdd/src/wlan_hdd_ftm.c
index 1125d4d502a4..7145e2e58cd8 100644
--- a/core/hdd/src/wlan_hdd_ftm.c
+++ b/core/hdd/src/wlan_hdd_ftm.c
@@ -101,7 +101,7 @@ static uint32_t wlan_ftm_postmsg(uint8_t *cmd_ptr, uint16_t cmd_len)
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
 						      &ftmMsg)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: : Failed to post Msg to HAL",
 		       __func__);
 
 		return QDF_STATUS_E_FAILURE;
@@ -130,7 +130,7 @@ static void wlan_hdd_ftm_update_tgt_cfg(void *context, void *param)
 	if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) {
 		hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr);
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Invalid MAC passed from target, using MAC from ini file"
 		       MAC_ADDRESS_STR, __func__,
 		       MAC_ADDR_ARRAY(hdd_ctx->config->intfMacAddr[0].bytes));
@@ -184,29 +184,29 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 #endif
 	hdd_context_t *hdd_ctx;
 
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening CDS", __func__);
 
 	if (NULL == gp_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Trying to open CDS without a PreOpen", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	/* Initialize the probe event */
 	if (qdf_event_create(&gp_cds_context->ProbeEvent) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Unable to init probeEvent", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (qdf_event_create(&(gp_cds_context->wmaCompleteEvent)) !=
 	    QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Unable to init wmaCompleteEvent", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 
 		goto err_probe_event;
 	}
@@ -216,10 +216,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to initialize CDS free message queue %d",
 			  __func__, vStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_wma_complete_event;
 	}
 
@@ -237,24 +237,24 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open CDS Scheduler %d", __func__,
 			  vStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_msg_queue;
 	}
 #if  defined(QCA_WIFI_FTM)
 	/* Initialize BMI and Download firmware */
 	pHifContext = cds_get_context(QDF_MODULE_ID_HIF);
 	if (!pHifContext) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: failed to get HIF context", __func__);
 		goto err_sched_close;
 	}
 
 	ol_ctx = cds_get_context(QDF_MODULE_ID_BMI);
 	if (bmi_download_firmware(ol_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: BMI failed to download target", __func__);
 		goto err_bmi_close;
 	}
@@ -268,13 +268,13 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	gp_cds_context->htc_ctx =
 		htc_create(pHifContext, &htcInfo, cdf_ctx);
 	if (!gp_cds_context->htc_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);
 		goto err_bmi_close;
 	}
 
 	if (bmi_done(ol_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_htc_close;
 	}
@@ -287,9 +287,9 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	hdd_ctx = (hdd_context_t *) (gp_cds_context->pHDDContext);
 	if ((NULL == hdd_ctx) || (NULL == hdd_ctx->config)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Hdd Context is Null", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_htc_close;
 	}
 
@@ -302,10 +302,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 			   wlan_hdd_ftm_update_tgt_cfg, NULL, &mac_openParms);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open WMA module %d", __func__,
 			  vStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_htc_close;
 	}
 #if  defined(QCA_WIFI_FTM)
@@ -313,12 +313,12 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	pHtcContext = cds_get_context(QDF_MODULE_ID_HTC);
 	if (!pHtcContext) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: failed to get HTC context", __func__);
 		goto err_wma_close;
 	}
 	if (htc_wait_target(pHtcContext)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to complete BMI phase", __func__);
 		goto err_wma_close;
 	}
@@ -338,9 +338,9 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 
 	if (eSIR_SUCCESS != sirStatus) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open MAC %d", __func__, sirStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_wma_close;
 	}
 #ifndef QCA_WIFI_FTM
@@ -348,7 +348,7 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	vStatus = sme_open(gp_cds_context->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
 		/* Critical Error ...  Cannot proceed further */
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to open SME %d", __func__, vStatus);
 		goto err_mac_close;
 	}
@@ -356,10 +356,10 @@ static QDF_STATUS wlan_ftm_cds_open(v_CONTEXT_t p_cds_context,
 	vStatus = sme_init_chan_list(gp_cds_context->pMACContext,
 				     hdd_ctx->reg.alpha2, hdd_ctx->reg.cc_src);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to init sme channel list", __func__);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: CDS successfully Opened", __func__);
 		return QDF_STATUS_SUCCESS;
 	}
@@ -417,17 +417,17 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 #ifndef QCA_WIFI_FTM
 	qdf_status = sme_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close SME %d", __func__, qdf_status);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 #endif
 
 	qdf_status = mac_close(((p_cds_contextType) cds_context)->pMACContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close MAC %d", __func__, qdf_status);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	((p_cds_contextType) cds_context)->pMACContext = NULL;
@@ -435,9 +435,9 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = wma_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close WMA %d", __func__, qdf_status);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 #if  defined(QCA_WIFI_FTM)
 	if (gp_cds_context->htc_ctx) {
@@ -447,9 +447,9 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 	}
 	qdf_status = wma_wmi_service_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close wma_wmi_service", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	hif_disable_isr(gp_cds_context->pHIFContext);
@@ -459,18 +459,18 @@ static QDF_STATUS wlan_ftm_cds_close(v_CONTEXT_t cds_context)
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->ProbeEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to destroy ProbeEvent %d", __func__,
 			  qdf_status);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	qdf_status = qdf_event_destroy(&gp_cds_context->wmaCompleteEvent);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to destroy wmaCompleteEvent %d", __func__,
 			  qdf_status);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	return QDF_STATUS_SUCCESS;
@@ -496,10 +496,10 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context)
 		cds_get_global_context();
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO, "cds prestart");
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO, "cds prestart");
 	if (NULL == p_cds_context->pWMAContext) {
-		CDF_ASSERT(0);
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_ASSERT(0);
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WMA NULL context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -510,9 +510,9 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context)
 	/*call WMA pre start */
 	vStatus = wma_pre_start(p_cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to WMA prestart ");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -521,23 +521,23 @@ static QDF_STATUS cds_ftm_pre_start(v_CONTEXT_t cds_context)
 					HDD_FTM_WMA_PRE_START_TIMEOUT);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		if (qdf_status == QDF_STATUS_E_TIMEOUT) {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Timeout occurred before WMA complete",
 				  __func__);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 				  "%s: wma_pre_start reporting  other error",
 				  __func__);
 		}
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 #if  defined(QCA_WIFI_FTM)
 	vStatus = htc_start(gp_cds_context->htc_ctx);
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_FATAL,
 			  "Failed to Start HTC");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	wma_wait_for_ready_event(gp_cds_context->pWMAContext);
@@ -560,22 +560,22 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx)
 	QDF_STATUS vStatus = QDF_STATUS_SUCCESS;
 	p_cds_contextType p_cds_context = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Opening CDS", __func__);
 
 	p_cds_context = cds_get_global_context();
 
 	if (NULL == p_cds_context) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Trying to open CDS without a PreOpen", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		goto err_cdf_status_failure;
 	}
 
 	vStatus = wlan_ftm_cds_open(p_cds_context, 0);
 
 	if (!QDF_IS_STATUS_SUCCESS(vStatus)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__);
 		goto err_cdf_status_failure;
 	}
 
@@ -588,7 +588,7 @@ int wlan_hdd_ftm_open(hdd_context_t *hdd_ctx)
 		(tHalHandle) cds_get_context(QDF_MODULE_ID_SME);
 
 	if (NULL == hdd_ctx->hHal) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: HAL context is null",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: HAL context is null",
 		       __func__);
 		goto err_ftm_close;
 	}
@@ -614,7 +614,7 @@ static int hdd_ftm_service_registration(hdd_context_t *hdd_ctx)
 	adapter = hdd_open_adapter(hdd_ctx, WLAN_HDD_FTM, "wlan%d",
 				    wlan_hdd_get_intf_addr(hdd_ctx), false);
 	if (NULL == adapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed",
 		       __func__);
 		goto err_adapter_open_failure;
 	}
@@ -661,13 +661,13 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx)
 	hdd_adapter_t *adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_FTM);
 	ENTER();
 	if (adapter == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s:adapter is NULL", __func__);
 		return -ENXIO;
 	}
 
 	if (WLAN_FTM_STARTED == hdd_ctx->ftm.ftm_state) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Ftm has been started. stopping ftm", __func__);
 		wlan_ftm_stop(hdd_ctx);
 	}
@@ -676,9 +676,9 @@ int wlan_hdd_ftm_close(hdd_context_t *hdd_ctx)
 
 	qdf_status = cds_sched_close(cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to close CDS Scheduler", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 	/* Close CDS */
 	wlan_ftm_cds_close(cds_context);
@@ -753,25 +753,25 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx)
 		return 0;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Starting CLD SW", __func__);
 
 	/* We support only one instance for now ... */
 	if (p_cds_context == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: mismatch in context", __func__);
 		goto err_status_failure;
 	}
 
 	if (p_cds_context->pMACContext == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: MAC NULL context", __func__);
 		goto err_status_failure;
 	}
 
 	/* Vos preStart is calling */
 	if (!QDF_IS_STATUS_SUCCESS(cds_ftm_pre_start(hdd_ctx->pcds_context))) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_pre_enable failed",
 		       __func__);
 		goto err_status_failure;
 	}
@@ -780,16 +780,16 @@ static int wlan_hdd_ftm_start(hdd_context_t *hdd_ctx)
 
 	vStatus = wma_start(p_cds_context);
 	if (vStatus != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to start WMA", __func__);
 		goto err_status_failure;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: MAC correctly started", __func__);
 
 	if (hdd_ftm_service_registration(hdd_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed", __func__);
 		goto err_ftm_service_reg;
 	}
@@ -1022,7 +1022,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len)
 		   cdf_mem_malloc(sizeof(*cmd_data));
 
 	if (!cmd_data) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("Failed to allocate FTM command data"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -1030,7 +1030,7 @@ QDF_STATUS wlan_hdd_ftm_testmode_cmd(void *data, int len)
 	cmd_data->data = cdf_mem_malloc(len);
 
 	if (!cmd_data->data) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("Failed to allocate FTM command data buffer"));
 		cdf_mem_free(cmd_data);
 		return QDF_STATUS_E_NOMEM;
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index eae9e175a609..bab97b7775ab 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -71,7 +71,7 @@
 #endif
 #include "wlan_hdd_trace.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "wlan_hdd_cfg.h"
 #include "cds_concurrency.h"
 #include "wlan_hdd_green_ap.h"
@@ -219,7 +219,7 @@ static int __hdd_hostapd_open(struct net_device *dev)
 
 	ENTER();
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_HOSTAPD_OPEN_REQUEST, NO_SESSION, 0));
 
 	if (cds_is_load_or_unload_in_progress()) {
@@ -589,7 +589,7 @@ static void hdd_issue_stored_joinreq(hdd_adapter_t *sta_adapter,
 	hal_handle = WLAN_HDD_GET_HAL_CTX(sta_adapter);
 
 	if (true ==  cds_is_sta_connection_pending()) {
-		MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+		MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 				TRACE_CODE_HDD_ISSUE_JOIN_REQ,
 				sta_adapter->sessionId, roam_id));
 		if (QDF_STATUS_SUCCESS !=
@@ -1517,7 +1517,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 						hddLog(LOGE,
 						       FL("Failed to init AP inactivity timer"));
 				} else
-					CDF_ASSERT
+					QDF_ASSERT
 						(qdf_mc_timer_get_current_state
 							(&pHddApCtx->
 							hdd_ap_inactivity_timer) ==
@@ -2207,7 +2207,7 @@ static int __iw_softap_set_two_ints_getnone(struct net_device *dev,
 		hdd_info("WE_DUMP_DP_TRACE: %d %d",
 		       value[1], value[2]);
 		if (value[1] == DUMP_DP_TRACE)
-			cdf_dp_trace_dump_all(value[2]);
+			qdf_dp_trace_dump_all(value[2]);
 		break;
 	case QCSAP_ENABLE_FW_PROFILE:
 		hddLog(LOG1, "QCSAP_ENABLE_FW_PROFILE: %d %d",
@@ -3020,7 +3020,7 @@ static __iw_softap_getparam(struct net_device *dev,
 
 	case QCSAP_PARAM_GET_WLAN_DBG:
 	{
-		cdf_trace_display();
+		qdf_trace_display();
 		*value = 0;
 		break;
 	}
@@ -3248,7 +3248,7 @@ int __iw_softap_modify_acl(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx =  hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Vos Context is NULL", __func__);
 		return -EINVAL;
 	}
@@ -3557,7 +3557,7 @@ static __iw_softap_disassoc_sta(struct net_device *dev,
 	ENTER();
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -3780,7 +3780,7 @@ int __iw_get_genie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: vos context is not valid ", __func__);
 		return -EINVAL;
 	}
@@ -4009,7 +4009,7 @@ static int __iw_set_ap_encodeext(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pVosContext is NULL", __func__);
 		return -EINVAL;
 	}
@@ -4455,7 +4455,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 	ENTER();
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -4468,7 +4468,7 @@ __iw_softap_setwpsie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is not valid ", __func__);
 		return -EINVAL;
 	}
@@ -5067,7 +5067,7 @@ __iw_softap_stopbss(struct net_device *dev,
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hddLog(LOGE,
 				       FL("wait for single_event failed!!"));
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 			}
 		}
 		clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);
@@ -5139,7 +5139,7 @@ QDF_STATUS hdd_softap_get_sta_info(hdd_adapter_t *pAdapter, uint8_t *pBuf,
 	ENTER();
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Adapter is NULL", __func__);
 		return -EINVAL;
 	}
@@ -5254,7 +5254,7 @@ static int __iw_set_ap_genie(struct net_device *dev,
 #ifndef WLAN_FEATURE_MBSSID
 	cds_ctx = hdd_ctx->pcds_context;
 	if (NULL == cds_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: CDF Context is NULL", __func__);
 		return -EINVAL;
 	}
@@ -6046,7 +6046,7 @@ QDF_STATUS hdd_init_ap_mode(hdd_adapter_t *pAdapter)
 
 	qdf_status = qdf_event_create(&phostapdBuf->cdf_stop_bss_event);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: Hostapd HDD stop bss event init failed!!"));
 #ifdef WLAN_FEATURE_MBSSID
 		wlansap_close(sapContext);
@@ -6352,7 +6352,7 @@ static int wlan_hdd_set_channel(struct wiphy *wiphy,
 	}
 	pAdapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_CHANNEL,
 			 pAdapter->sessionId, channel_type));
 
@@ -7812,7 +7812,7 @@ static int wlan_hdd_cfg80211_start_bss(hdd_adapter_t *pHostapdAdapter,
 #else
 		wlansap_stop_bss(p_cds_context);
 #endif
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return -EINVAL;
 	}
 	/* Succesfully started Bss update the state bit. */
@@ -7877,7 +7877,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_STOP_AP,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
@@ -7918,7 +7918,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 				if (!rc) {
 					hddLog(LOGE,
 					       FL("Timeout occurred while waiting for abortscan"));
-					CDF_ASSERT(pScanInfo->mScanPending);
+					QDF_ASSERT(pScanInfo->mScanPending);
 				}
 			}
 		}
@@ -7976,7 +7976,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hddLog(LOGE,
 				       FL("HDD cdf wait for single_event failed!!"));
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 			}
 		}
 		clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags);
@@ -8105,7 +8105,7 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_START_AP, pAdapter->sessionId,
 			 params->beacon_interval));
 	if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
@@ -8263,7 +8263,7 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_CHANGE_BEACON,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index 626a19ebfb08..27f74c7f3d70 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -127,7 +127,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics,
 	hdd_adapter_t *adapter = NULL;
 
 	if (NULL == context) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, context [%p]", __func__, context);
 		return;
 	}
@@ -149,7 +149,7 @@ static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics,
 		 * nothing we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, adapter [%p] magic [%08x]",
 		       __func__, adapter, stats_context->magic);
 		return;
@@ -192,7 +192,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter,
 	hdd_context_t *hdd_ctx = NULL;
 
 	if (NULL == adapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: adapter is NULL", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -211,7 +211,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter,
 				    hdd_sta_ctx->conn_info.bssId,
 				    &context, hdd_ctx->pcds_context, tid);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Unable to retrieve statistics", __func__);
 		vstatus = QDF_STATUS_E_FAULT;
 	} else {
@@ -219,7 +219,7 @@ QDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter,
 		rc = wait_for_completion_timeout(&context.completion,
 				msecs_to_jiffies(WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: SME timed out while retrieving statistics",
 			       __func__);
 			vstatus = QDF_STATUS_E_TIMEOUT;
@@ -279,7 +279,7 @@ static void hdd_get_band_helper(hdd_context_t *hdd_ctx, int *pBand)
 		break;
 
 	default:
-		hddLog(CDF_TRACE_LEVEL_WARN, "%s: Invalid Band %d", __func__,
+		hddLog(QDF_TRACE_LEVEL_WARN, "%s: Invalid Band %d", __func__,
 		       band);
 		*pBand = -1;
 		break;
@@ -548,7 +548,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid,
 
 	/* if not associated, no need to proceed with reassoc */
 	if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__);
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__);
 		ret = -EINVAL;
 		goto exit;
 	}
@@ -568,7 +568,7 @@ hdd_reassoc(hdd_adapter_t *adapter, const uint8_t *bssid,
 	/* Check channel number is a valid channel number */
 	if (QDF_STATUS_SUCCESS !=
 	    wlan_hdd_validate_operation_channel(adapter, channel)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Invalid Channel %d",
 		       __func__, channel);
 		ret = -EINVAL;
 		goto exit;
@@ -614,7 +614,7 @@ static int hdd_parse_reassoc_v1(hdd_adapter_t *adapter, const char *command)
 
 	ret = hdd_parse_reassoc_command_v1_data(command, bssid, &channel);
 	if (ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Failed to parse reassoc command data", __func__);
 	} else {
 		ret = hdd_reassoc(adapter, bssid, channel);
@@ -736,7 +736,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid,
 
 	/* if not associated, no need to send action frame */
 	if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__);
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: Not associated", __func__);
 		ret = -EINVAL;
 		goto exit;
 	}
@@ -765,7 +765,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid,
 			if (channel != 0) {
 				if (channel !=
 				    pHddStaCtx->conn_info.operationChannel) {
-					hddLog(CDF_TRACE_LEVEL_INFO,
+					hddLog(QDF_TRACE_LEVEL_INFO,
 					       "%s: channel(%d) is different from operating channel(%d)",
 					       __func__, channel,
 					       pHddStaCtx->conn_info.
@@ -795,7 +795,7 @@ hdd_sendactionframe(hdd_adapter_t *adapter, const uint8_t *bssid,
 		}
 	}
 	if (chan.center_freq == 0) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s:invalid channel number %d",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s:invalid channel number %d",
 		       __func__, channel);
 		ret = -EINVAL;
 		goto exit;
@@ -874,7 +874,7 @@ hdd_parse_sendactionframe_v1(hdd_adapter_t *adapter, const char *command)
 						  &dwell_time, &payload,
 						  &payload_len);
 	if (ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Failed to parse send action frame data", __func__);
 	} else {
 		ret = hdd_sendactionframe(adapter, bssid, channel,
@@ -1028,7 +1028,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList,
 
 	*pNumChannels = tempInt;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Number of channels are: %d", *pNumChannels);
 
 	for (j = 0; j < (*pNumChannels); j++) {
@@ -1076,7 +1076,7 @@ hdd_parse_channellist(const uint8_t *pValue, uint8_t *pChannelList,
 		}
 		pChannelList[j] = tempInt;
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "Channel %d added to preferred channel list",
 			  pChannelList[j]);
 	}
@@ -1113,18 +1113,18 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter,
 
 	ret = hdd_parse_channellist(command, channel_list, &num_chan);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to parse channel list information",
 			  __func__);
 		goto exit;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
 			 adapter->sessionId, num_chan));
 
 	if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: number of channels (%d) supported exceeded max (%d)",
 			  __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN);
 		ret = -EINVAL;
@@ -1136,7 +1136,7 @@ hdd_parse_set_roam_scan_channels_v1(hdd_adapter_t *adapter,
 						  adapter->sessionId,
 						  channel_list, num_chan);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to update channel list information",
 			  __func__);
 		ret = -EINVAL;
@@ -1182,21 +1182,21 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter,
 
 	num_chan = *value++;
 	if (num_chan > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: number of channels (%d) supported exceeded max (%d)",
 			  __func__, num_chan, WNI_CFG_VALID_CHANNEL_LIST_LEN);
 		ret = -EINVAL;
 		goto exit;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELS_IOCTL,
 			 adapter->sessionId, num_chan));
 
 	for (i = 0; i < num_chan; i++) {
 		channel = *value++;
 		if (channel > WNI_CFG_CURRENT_CHANNEL_STAMAX) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: index %d invalid channel %d", __func__,
 				  i, channel);
 			ret = -EINVAL;
@@ -1209,7 +1209,7 @@ hdd_parse_set_roam_scan_channels_v2(hdd_adapter_t *adapter,
 						  adapter->sessionId,
 						  channel_list, num_chan);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to update channel list information",
 			  __func__);
 		ret = -EINVAL;
@@ -1326,7 +1326,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 		return QDF_STATUS_E_FAILURE;
 
 	pPlmRequest->diag_token = content;
-	hddLog(CDF_TRACE_LEVEL_DEBUG, "diag token %d",
+	hddLog(QDF_TRACE_LEVEL_DEBUG, "diag token %d",
 	       pPlmRequest->diag_token);
 	cmdPtr = strpbrk(cmdPtr, " ");
 
@@ -1347,10 +1347,10 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 		return QDF_STATUS_E_FAILURE;
 
 	pPlmRequest->meas_token = content;
-	hddLog(CDF_TRACE_LEVEL_DEBUG, "meas token %d",
+	hddLog(QDF_TRACE_LEVEL_DEBUG, "meas token %d",
 	       pPlmRequest->meas_token);
 
-	hddLog(CDF_TRACE_LEVEL_ERROR,
+	hddLog(QDF_TRACE_LEVEL_ERROR,
 	       "PLM req %s", pPlmRequest->enable ? "START" : "STOP");
 	if (pPlmRequest->enable) {
 
@@ -1376,7 +1376,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->numBursts = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "num burst %d",
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "num burst %d",
 		       pPlmRequest->numBursts);
 		cmdPtr = strpbrk(cmdPtr, " ");
 
@@ -1400,7 +1400,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->burstInt = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "burst Int %d",
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "burst Int %d",
 		       pPlmRequest->burstInt);
 		cmdPtr = strpbrk(cmdPtr, " ");
 
@@ -1424,7 +1424,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->measDuration = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "measDur %d",
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "measDur %d",
 		       pPlmRequest->measDuration);
 		cmdPtr = strpbrk(cmdPtr, " ");
 
@@ -1448,7 +1448,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->burstLen = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "burstLen %d",
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "burstLen %d",
 		       pPlmRequest->burstLen);
 		cmdPtr = strpbrk(cmdPtr, " ");
 
@@ -1472,7 +1472,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->desiredTxPwr = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG,
+		hddLog(QDF_TRACE_LEVEL_DEBUG,
 		       "desiredTxPwr %d", pPlmRequest->desiredTxPwr);
 
 		for (count = 0; count < QDF_MAC_ADDR_SIZE; count++) {
@@ -1522,7 +1522,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 			return QDF_STATUS_E_FAILURE;
 
 		pPlmRequest->plmNumCh = content;
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "numch %d",
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "numch %d",
 		       pPlmRequest->plmNumCh);
 
 		/* Channel numbers */
@@ -1549,7 +1549,7 @@ QDF_STATUS hdd_parse_plm_cmd(uint8_t *pValue, tSirPlmReq *pPlmRequest)
 				return QDF_STATUS_E_FAILURE;
 
 			pPlmRequest->plmChList[count] = content;
-			hddLog(CDF_TRACE_LEVEL_DEBUG, " ch- %d",
+			hddLog(QDF_TRACE_LEVEL_DEBUG, " ch- %d",
 			       pPlmRequest->plmChList[count]);
 		}
 	}
@@ -1566,7 +1566,7 @@ static void wlan_hdd_ready_to_extwow(void *callbackContext, bool is_success)
 
 	rc = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != rc) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return;
 	}
 	hdd_ctx->ext_wow_should_suspend = is_success;
@@ -1590,7 +1590,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 						&wlan_hdd_ready_to_extwow,
 						hdd_ctx);
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_ext_wow returned failure %d"),
 		       cdf_ret_status);
 		return -EPERM;
@@ -1599,7 +1599,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 	rc = wait_for_completion_timeout(&hdd_ctx->ready_to_extwow,
 			msecs_to_jiffies(WLAN_WAIT_TIME_READY_TO_EXTWOW));
 	if (!rc) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to get ready to extwow", __func__);
 		return -EPERM;
 	}
@@ -1609,20 +1609,20 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 			pm_message_t state;
 
 			state.event = PM_EVENT_SUSPEND;
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: Received ready to ExtWoW. Going to suspend",
 				  __func__);
 
 			rc = wlan_hdd_cfg80211_suspend_wlan(hdd_ctx->wiphy, NULL);
 			if (rc < 0) {
-				CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 					"%s: wlan_hdd_cfg80211_suspend_wlan failed, error = %d",
 					__func__, rc);
 				return rc;
 			}
 			cdf_ret_status = wlan_hdd_bus_suspend(state);
 			if (cdf_ret_status != QDF_STATUS_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 					"%s: wlan_hdd_suspend failed, status = %d",
 					__func__, cdf_ret_status);
 				wlan_hdd_cfg80211_resume_wlan(hdd_ctx->wiphy);
@@ -1630,7 +1630,7 @@ static int hdd_enable_ext_wow(hdd_adapter_t *adapter,
 			}
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Received ready to ExtWoW failure", __func__);
 		return -EPERM;
 	}
@@ -1647,13 +1647,13 @@ static int hdd_enable_ext_wow_parser(hdd_adapter_t *adapter, int vdev_id,
 
 	rc = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != rc) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return -EINVAL;
 	}
 
 	if (value < EXT_WOW_TYPE_APP_TYPE1 ||
 	    value > EXT_WOW_TYPE_APP_TYPE1_2) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid type"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid type"));
 		return -EINVAL;
 	}
 
@@ -1668,7 +1668,7 @@ static int hdd_enable_ext_wow_parser(hdd_adapter_t *adapter, int vdev_id,
 		 hdd_ctx->is_extwow_app_type2_param_set)
 		params.type = value;
 	else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Set app params before enable it value %d"), value);
 		return -EINVAL;
 	}
@@ -1691,7 +1691,7 @@ static int hdd_set_app_type1_params(tHalHandle hHal,
 
 	cdf_ret_status = sme_configure_app_type1_params(hHal, &params);
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_app_type1_params returned failure %d"),
 		       cdf_ret_status);
 		return -EPERM;
@@ -1711,12 +1711,12 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter,
 
 	rc = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != rc) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return -EINVAL;
 	}
 
 	if (2 != sscanf(arg, "%8s %16s", id, password)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid Number of arguments"));
 		return -EINVAL;
 	}
@@ -1730,7 +1730,7 @@ static int hdd_set_app_type1_parser(hdd_adapter_t *adapter,
 	params.pass_length = strlen(password);
 	cdf_mem_copy(params.password, password, params.pass_length);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: %d %pM %.8s %u %.16s %u",
 		  __func__, params.vdev_id, params.wakee_mac_addr.bytes,
 		  params.identification_id, params.id_length,
@@ -1749,7 +1749,7 @@ static int hdd_set_app_type2_params(tHalHandle hHal,
 
 	cdf_ret_status = sme_configure_app_type2_params(hHal, &params);
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_app_type2_params returned failure %d"),
 		       cdf_ret_status);
 		return -EPERM;
@@ -1770,7 +1770,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return -EINVAL;
 	}
 
@@ -1792,7 +1792,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
 		     (unsigned int *)&params.tcp_rx_timeout_val);
 
 	if (ret != 15 && ret != 7) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid Number of arguments");
 		return -EINVAL;
 	}
@@ -1801,14 +1801,14 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
 	    sscanf(mac_addr, "%02x:%02x:%02x:%02x:%02x:%02x", &gateway_mac[0],
 		   &gateway_mac[1], &gateway_mac[2], &gateway_mac[3],
 		   &gateway_mac[4], &gateway_mac[5])) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid MacAddress Input %s", mac_addr);
 		return -EINVAL;
 	}
 
 	if (params.tcp_src_port > WLAN_HDD_MAX_TCP_PORT ||
 	    params.tcp_dst_port > WLAN_HDD_MAX_TCP_PORT) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid TCP Port Number");
 		return -EINVAL;
 	}
@@ -1848,7 +1848,7 @@ static int hdd_set_app_type2_parser(hdd_adapter_t *adapter,
 			params.tcp_rx_timeout_val :
 			hdd_ctx->config->extWowApp2TcpRxTimeout;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: %pM %.16s %u %u %u %u %u %u %u %u %u %u %u %u %u",
 		  __func__, gateway_mac, rc4_key, params.ip_id,
 		  params.ip_device_ip, params.ip_server_ip, params.tcp_seq,
@@ -1911,7 +1911,7 @@ static int hdd_parse_setmaxtxpower_command(uint8_t *pValue, int *pTxPower)
 
 	*pTxPower = tempInt;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "SETMAXTXPOWER: %d", *pTxPower);
 
 	return 0;
@@ -1923,7 +1923,7 @@ static int hdd_get_dwell_time(struct hdd_config *pCfg, uint8_t *command,
 	int ret = 0;
 
 	if (!pCfg || !command || !extra || !len) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: argument passed for GETDWELLTIME is incorrect",
 			  __func__);
 		ret = -EINVAL;
@@ -2049,7 +2049,7 @@ static void hdd_get_link_status_cb(uint8_t status, void *context)
 	hdd_adapter_t *adapter;
 
 	if (NULL == context) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Bad context [%p]",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Bad context [%p]",
 		       __func__, context);
 		return;
 	}
@@ -2066,7 +2066,7 @@ static void hdd_get_link_status_cb(uint8_t status, void *context)
 		 * nothing we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, adapter [%p] magic [%08x]",
 		       __func__, adapter, pLinkContext->magic);
 		return;
@@ -2138,7 +2138,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter)
 				      hdd_get_link_status_cb,
 				      &context, adapter->sessionId);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Unable to retrieve link status", __func__);
 		/* return a cached value */
 	} else {
@@ -2146,7 +2146,7 @@ static int wlan_hdd_get_link_status(hdd_adapter_t *adapter)
 		rc = wait_for_completion_timeout(&context.completion,
 				msecs_to_jiffies(WLAN_WAIT_TIME_LINK_STATUS));
 		if (!rc)
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("SME timed out while retrieving link status"));
 	}
 
@@ -2215,7 +2215,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 
 	pEseBcnReq->numBcnReqIe = tempInt;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "Number of Bcn Req Ie fields(%d)", pEseBcnReq->numBcnReqIe);
 
 	for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) {
@@ -2252,8 +2252,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 			switch (i) {
 			case 0: /* Measurement token */
 				if (tempInt <= 0) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "Invalid Measurement Token(%d)",
 						  tempInt);
 					return -EINVAL;
@@ -2266,8 +2266,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 				if ((tempInt <= 0) ||
 				    (tempInt >
 				     WNI_CFG_CURRENT_CHANNEL_STAMAX)) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "Invalid Channel Number(%d)",
 						  tempInt);
 					return -EINVAL;
@@ -2278,8 +2278,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 			case 2: /* Scan mode */
 				if ((tempInt < eSIR_PASSIVE_SCAN)
 				    || (tempInt > eSIR_BEACON_TABLE)) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "Invalid Scan Mode(%d) Expected{0|1|2}",
 						  tempInt);
 					return -EINVAL;
@@ -2294,8 +2294,8 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 				    ((tempInt < 0) &&
 				     (pEseBcnReq->bcnReq[j].scanMode ==
 						eSIR_BEACON_TABLE))) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "Invalid Measurement Duration(%d)",
 						  tempInt);
 					return -EINVAL;
@@ -2308,7 +2308,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *pValue,
 	}
 
 	for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "Index(%d) Measurement Token(%u) Channel(%u) Scan Mode(%u) Measurement Duration(%u)",
 			  j,
 			  pEseBcnReq->bcnReq[j].measurementToken,
@@ -2404,7 +2404,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate)
 	struct hdd_config *pConfig = NULL;
 
 	if (pHddCtx == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is null", __func__);
 		return -EINVAL;
 	}
@@ -2434,7 +2434,7 @@ int wlan_hdd_set_mc_rate(hdd_adapter_t *pAdapter, int targetRate)
 		pAdapter->device_mode);
 	status = sme_send_rate_update_ind(pHddCtx->hHal, &rateUpdate);
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: SETMCRATE failed",
 		       __func__);
 		return -EFAULT;
 	}
@@ -2449,7 +2449,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter,
 {
 	int ret = 0;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_P2P_DEV_ADDR_IOCTL,
 			 adapter->sessionId,
 			(unsigned)(*(hdd_ctx->p2pDeviceAddress.bytes + 2)
@@ -2461,7 +2461,7 @@ static int drv_cmd_p2p_dev_addr(hdd_adapter_t *adapter,
 
 	if (copy_to_user(priv_data->buf, hdd_ctx->p2pDeviceAddress.bytes,
 			 sizeof(tSirMacAddr))) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: failed to copy data to user buffer",
 		       __func__);
 		ret = -EFAULT;
@@ -2530,7 +2530,7 @@ static int drv_cmd_set_band(hdd_adapter_t *adapter,
 	 * First 8 bytes will have "SETBAND " and
 	 * 9 byte will have band setting value
 	 */
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "%s: SetBandCommand Info  comm %s UL %d, TL %d",
 	       __func__, command, priv_data->used_len,
 	       priv_data->total_len);
@@ -2577,11 +2577,11 @@ static int drv_cmd_country(hdd_adapter_t *adapter,
 			&adapter->change_country_code,
 			 msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY));
 		if (!rc)
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: SME while setting country code timed out",
 			       __func__);
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: SME Change Country code fail, status=%d",
 		       __func__, status);
 		ret = -EINVAL;
@@ -2612,8 +2612,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed Input value may be out of range[%d - %d]",
 			  __func__,
 			  CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN,
@@ -2626,8 +2626,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter,
 
 	if ((lookUpThreshold < CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN)
 	    || (lookUpThreshold > CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Neighbor lookup threshold value %d is out of range (Min: %d Max: %d)",
 			  lookUpThreshold,
 			  CFG_NEIGHBOR_LOOKUP_RSSI_THRESHOLD_MIN,
@@ -2636,10 +2636,10 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMTRIGGER_IOCTL,
 			 adapter->sessionId, lookUpThreshold));
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set Roam trigger (Neighbor lookup threshold) = %d",
 		  __func__,
 		  lookUpThreshold);
@@ -2649,8 +2649,8 @@ static int drv_cmd_set_roam_trigger(hdd_adapter_t *adapter,
 							adapter->sessionId,
 							lookUpThreshold);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to set roam trigger, try again",
 			  __func__);
 		ret = -EPERM;
@@ -2674,15 +2674,15 @@ static int drv_cmd_get_roam_trigger(hdd_adapter_t *adapter,
 	char extra[32];
 	uint8_t len = 0;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMTRIGGER_IOCTL,
 			 adapter->sessionId, lookUpThreshold));
 
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -2715,8 +2715,8 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed Input value may be out of range[%d - %d]",
 			  __func__,
 			  (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000),
@@ -2727,8 +2727,8 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter,
 
 	if ((roamScanPeriod < (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000))
 	    || (roamScanPeriod > (CFG_EMPTY_SCAN_REFRESH_PERIOD_MAX / 1000))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Roam scan period value %d is out of range (Min: %d Max: %d)",
 			  roamScanPeriod,
 			  (CFG_EMPTY_SCAN_REFRESH_PERIOD_MIN / 1000),
@@ -2736,12 +2736,12 @@ static int drv_cmd_set_roam_scan_period(hdd_adapter_t *adapter,
 		ret = -EINVAL;
 		goto exit;
 	}
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANPERIOD_IOCTL,
 			 adapter->sessionId, roamScanPeriod));
 	neighborEmptyScanRefreshPeriod = roamScanPeriod * 1000;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set roam scan period (Empty Scan refresh period) = %d",
 		  __func__,
 		  roamScanPeriod);
@@ -2768,7 +2768,7 @@ static int drv_cmd_get_roam_scan_period(hdd_adapter_t *adapter,
 	char extra[32];
 	uint8_t len = 0;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANPERIOD_IOCTL,
 			 adapter->sessionId,
 			 nEmptyScanRefreshPeriod));
@@ -2809,8 +2809,8 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed Input value may be out of range[%d - %d]",
 			  __func__,
 			  CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000,
@@ -2823,8 +2823,8 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter,
 		(CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN / 1000))
 	    || (roamScanRefreshPeriod >
 		(CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MAX / 1000))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Neighbor scan results refresh period value %d is out of range (Min: %d Max: %d)",
 			  roamScanRefreshPeriod,
 			  (CFG_NEIGHBOR_SCAN_RESULTS_REFRESH_PERIOD_MIN
@@ -2836,7 +2836,7 @@ static int drv_cmd_set_roam_scan_refresh_period(hdd_adapter_t *adapter,
 	}
 	neighborScanRefreshPeriod = roamScanRefreshPeriod * 1000;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set roam scan refresh period (Scan refresh period) = %d",
 		  __func__,
 		  roamScanRefreshPeriod);
@@ -2869,8 +2869,8 @@ static int drv_cmd_get_roam_scan_refresh_period(hdd_adapter_t *adapter,
 	/* Returned value is in units of seconds */
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -2899,8 +2899,8 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_LFR_FEATURE_ENABLED_MIN,
 			  CFG_LFR_FEATURE_ENABLED_MAX);
@@ -2909,8 +2909,8 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter,
 	}
 	if ((roamMode < CFG_LFR_FEATURE_ENABLED_MIN) ||
 	    (roamMode > CFG_LFR_FEATURE_ENABLED_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Roam Mode value %d is out of range (Min: %d Max: %d)",
 			  roamMode,
 			  CFG_LFR_FEATURE_ENABLED_MIN,
@@ -2919,7 +2919,7 @@ static int drv_cmd_set_roam_mode(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: Received Command to Set Roam Mode = %d",
 		  __func__, roamMode);
 	/*
@@ -2983,8 +2983,8 @@ static int drv_cmd_get_roam_mode(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3013,8 +3013,8 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_ROAM_RSSI_DIFF_MIN,
 			  CFG_ROAM_RSSI_DIFF_MAX);
@@ -3024,8 +3024,8 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter,
 
 	if ((roamRssiDiff < CFG_ROAM_RSSI_DIFF_MIN) ||
 	    (roamRssiDiff > CFG_ROAM_RSSI_DIFF_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Roam rssi diff value %d is out of range (Min: %d Max: %d)",
 			  roamRssiDiff,
 			  CFG_ROAM_RSSI_DIFF_MIN,
@@ -3034,7 +3034,7 @@ static int drv_cmd_set_roam_delta(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set roam rssi diff = %d",
 		  __func__, roamRssiDiff);
 
@@ -3059,7 +3059,7 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter,
 	char extra[32];
 	uint8_t len = 0;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMDELTA_IOCTL,
 			 adapter->sessionId, roamRssiDiff));
 
@@ -3068,8 +3068,8 @@ static int drv_cmd_get_roam_delta(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3091,7 +3091,7 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter,
 
 	hdd_get_band_helper(hdd_ctx, &band);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETBAND_IOCTL,
 			 adapter->sessionId, band));
 
@@ -3099,8 +3099,8 @@ static int drv_cmd_get_band(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3136,15 +3136,15 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter,
 					       ChannelList,
 					       &numChannels,
 					       adapter->sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_FATAL,
 			  "%s: failed to get roam scan channel list",
 			  __func__);
 		ret = -EFAULT;
 		goto exit;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANCHANNELS_IOCTL,
 			 adapter->sessionId, numChannels));
 	/*
@@ -3160,8 +3160,8 @@ static int drv_cmd_get_roam_scan_channels(hdd_adapter_t *adapter,
 
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3190,8 +3190,8 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter,
 	if (eseMode &&
 	    hdd_is_okc_mode_enabled(hdd_ctx) &&
 	    sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_WARN,
 			  "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
 			  __func__);
 		ret = -EPERM;
@@ -3202,8 +3202,8 @@ static int drv_cmd_get_ccx_mode(hdd_adapter_t *adapter,
 			"GETCCXMODE", eseMode);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3232,8 +3232,8 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter,
 	if (okcMode &&
 	    sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
 	    sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_WARN,
 			  "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
 			  __func__);
 		ret = -EPERM;
@@ -3245,8 +3245,8 @@ static int drv_cmd_get_okc_mode(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3273,8 +3273,8 @@ static int drv_cmd_get_fast_roam(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3299,8 +3299,8 @@ static int drv_cmd_get_fast_transition(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3329,8 +3329,8 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__,
 			  CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN,
@@ -3341,8 +3341,8 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter,
 
 	if ((minTime < CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN) ||
 	    (minTime > CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "scan min channel time value %d is out of range (Min: %d Max: %d)",
 			  minTime,
 			  CFG_NEIGHBOR_SCAN_MIN_CHAN_TIME_MIN,
@@ -3351,10 +3351,10 @@ static int drv_cmd_set_roam_scan_channel_min_time(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_SETROAMSCANCHANNELMINTIME_IOCTL,
 			 adapter->sessionId, minTime));
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change channel min time = %d",
 		  __func__, minTime);
 
@@ -3393,13 +3393,13 @@ static int drv_cmd_get_roam_scan_channel_min_time(hdd_adapter_t *adapter,
 			"GETROAMSCANCHANNELMINTIME", val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_GETROAMSCANCHANNELMINTIME_IOCTL,
 			 adapter->sessionId, val));
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3428,8 +3428,8 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou16 failed range [%d - %d]",
 			  __func__,
 			  CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN,
@@ -3440,8 +3440,8 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter,
 
 	if ((maxTime < CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN) ||
 	    (maxTime > CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "lfr mode value %d is out of range (Min: %d Max: %d)",
 			  maxTime,
 			  CFG_NEIGHBOR_SCAN_MAX_CHAN_TIME_MIN,
@@ -3450,7 +3450,7 @@ static int drv_cmd_set_scan_channel_time(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change channel max time = %d",
 		  __func__, maxTime);
 
@@ -3481,8 +3481,8 @@ static int drv_cmd_get_scan_channel_time(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-			 CDF_TRACE(QDF_MODULE_ID_HDD,
-			 CDF_TRACE_LEVEL_ERROR,
+			 QDF_TRACE(QDF_MODULE_ID_HDD,
+			 QDF_TRACE_LEVEL_ERROR,
 			 "%s: failed to copy data to user buffer",
 			 __func__);
 		ret = -EFAULT;
@@ -3511,8 +3511,8 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou16 failed range [%d - %d]",
 			  __func__,
 			  CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN,
@@ -3523,8 +3523,8 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter,
 
 	if ((val < CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN) ||
 	    (val > CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "scan home time value %d is out of range (Min: %d Max: %d)",
 			  val,
 			  CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN,
@@ -3533,7 +3533,7 @@ static int drv_cmd_set_scan_home_time(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change scan home time = %d",
 		  __func__, val);
 
@@ -3564,8 +3564,8 @@ static int drv_cmd_get_scan_home_time(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3594,8 +3594,8 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_ROAM_INTRA_BAND_MIN,
 			  CFG_ROAM_INTRA_BAND_MAX);
@@ -3605,8 +3605,8 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter,
 
 	if ((val < CFG_ROAM_INTRA_BAND_MIN) ||
 	    (val > CFG_ROAM_INTRA_BAND_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "intra band mode value %d is out of range (Min: %d Max: %d)",
 			  val,
 			  CFG_ROAM_INTRA_BAND_MIN,
@@ -3614,7 +3614,7 @@ static int drv_cmd_set_roam_intra_band(hdd_adapter_t *adapter,
 		ret = -EINVAL;
 		goto exit;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change intra band = %d",
 		  __func__, val);
 
@@ -3641,8 +3641,8 @@ static int drv_cmd_get_roam_intra_band(hdd_adapter_t *adapter,
 			"GETROAMINTRABAND", val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3671,8 +3671,8 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_ROAM_SCAN_N_PROBES_MIN,
 			  CFG_ROAM_SCAN_N_PROBES_MAX);
@@ -3682,8 +3682,8 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter,
 
 	if ((nProbes < CFG_ROAM_SCAN_N_PROBES_MIN) ||
 	    (nProbes > CFG_ROAM_SCAN_N_PROBES_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "NProbes value %d is out of range (Min: %d Max: %d)",
 			  nProbes,
 			  CFG_ROAM_SCAN_N_PROBES_MIN,
@@ -3692,7 +3692,7 @@ static int drv_cmd_set_scan_n_probes(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set nProbes = %d",
 		  __func__, nProbes);
 
@@ -3718,8 +3718,8 @@ static int drv_cmd_get_scan_n_probes(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3750,8 +3750,8 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__,
 			  CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN,
@@ -3762,8 +3762,8 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter,
 
 	if ((homeAwayTime < CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN) ||
 	    (homeAwayTime > CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "homeAwayTime value %d is out of range (Min: %d Max: %d)",
 			  homeAwayTime,
 			  CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN,
@@ -3772,7 +3772,7 @@ static int drv_cmd_set_scan_home_away_time(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set scan away time = %d",
 		  __func__, homeAwayTime);
 
@@ -3804,8 +3804,8 @@ static int drv_cmd_get_scan_home_away_time(hdd_adapter_t *adapter,
 	len = QDF_MIN(priv_data->total_len, len + 1);
 
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3843,8 +3843,8 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__,
 			  CFG_ENABLE_WES_MODE_NAME_MIN,
@@ -3855,8 +3855,8 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter,
 
 	if ((wesMode < CFG_ENABLE_WES_MODE_NAME_MIN) ||
 	    (wesMode > CFG_ENABLE_WES_MODE_NAME_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "WES Mode value %d is out of range (Min: %d Max: %d)",
 			  wesMode,
 			  CFG_ENABLE_WES_MODE_NAME_MIN,
@@ -3865,7 +3865,7 @@ static int drv_cmd_set_wes_mode(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set WES Mode rssi diff = %d",
 		  __func__, wesMode);
 
@@ -3890,8 +3890,8 @@ static int drv_cmd_get_wes_mode(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, wesMode);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3921,14 +3921,14 @@ static int drv_cmd_set_opportunistic_rssi_diff(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed.", __func__);
 		ret = -EINVAL;
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set Opportunistic Threshold diff = %d",
 		  __func__, nOpportunisticThresholdDiff);
 
@@ -3955,8 +3955,8 @@ static int drv_cmd_get_opportunistic_rssi_diff(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -3985,14 +3985,14 @@ static int drv_cmd_set_roam_rescan_rssi_diff(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed.", __func__);
 		ret = -EINVAL;
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set Roam Rescan RSSI Diff = %d",
 		  __func__, nRoamRescanRssiDiff);
 
@@ -4018,8 +4018,8 @@ static int drv_cmd_get_roam_rescan_rssi_diff(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -4048,8 +4048,8 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_LFR_FEATURE_ENABLED_MIN,
 			  CFG_LFR_FEATURE_ENABLED_MAX);
@@ -4059,8 +4059,8 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter,
 
 	if ((lfrMode < CFG_LFR_FEATURE_ENABLED_MIN) ||
 	    (lfrMode > CFG_LFR_FEATURE_ENABLED_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "lfr mode value %d is out of range (Min: %d Max: %d)",
 			  lfrMode,
 			  CFG_LFR_FEATURE_ENABLED_MIN,
@@ -4069,7 +4069,7 @@ static int drv_cmd_set_fast_roam(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change lfr mode = %d",
 		  __func__, lfrMode);
 
@@ -4103,8 +4103,8 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__,
 			  CFG_FAST_TRANSITION_ENABLED_NAME_MIN,
@@ -4115,8 +4115,8 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter,
 
 	if ((ft < CFG_FAST_TRANSITION_ENABLED_NAME_MIN) ||
 	    (ft > CFG_FAST_TRANSITION_ENABLED_NAME_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "ft mode value %d is out of range (Min: %d Max: %d)",
 			  ft,
 			  CFG_FAST_TRANSITION_ENABLED_NAME_MIN,
@@ -4125,7 +4125,7 @@ static int drv_cmd_set_fast_transition(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change ft mode = %d",
 		  __func__, ft);
 
@@ -4163,7 +4163,7 @@ static void hdd_wma_send_fastreassoc_cmd(int sessionId, tSirMacAddr bssid,
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA,
 								&msg)) {
 		cdf_mem_free(fastreassoc);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		FL("Not able to post ROAM_INVOKE_CMD message to WMA"));
 	}
 }
@@ -4196,8 +4196,8 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter,
 
 	/* if not associated, no need to proceed with reassoc */
 	if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_INFO,
 			  "%s:Not associated!", __func__);
 		ret = -EINVAL;
 		goto exit;
@@ -4206,8 +4206,8 @@ static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter,
 	ret = hdd_parse_reassoc_command_v1_data(value, targetApBssid,
 						&channel);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to parse reassoc command data",
 			  __func__);
 		goto exit;
@@ -4321,8 +4321,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter,
 	if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
 	    hdd_is_okc_mode_enabled(hdd_ctx) &&
 	    sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_WARN,
 			  "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
 			  __func__);
 		ret = -EPERM;
@@ -4339,8 +4339,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_ESE_FEATURE_ENABLED_MIN,
 			  CFG_ESE_FEATURE_ENABLED_MAX);
@@ -4350,8 +4350,8 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter,
 
 	if ((eseMode < CFG_ESE_FEATURE_ENABLED_MIN) ||
 	    (eseMode > CFG_ESE_FEATURE_ENABLED_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Ese mode value %d is out of range (Min: %d Max: %d)",
 			  eseMode,
 			  CFG_ESE_FEATURE_ENABLED_MIN,
@@ -4359,7 +4359,7 @@ static int drv_cmd_set_ccx_mode(hdd_adapter_t *adapter,
 		ret = -EINVAL;
 		goto exit;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change ese mode = %d",
 		  __func__, eseMode);
 
@@ -4393,14 +4393,14 @@ static int drv_cmd_set_roam_scan_control(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed ", __func__);
 		ret = -EINVAL;
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set roam scan control = %d",
 		  __func__, roamScanControl);
 
@@ -4434,8 +4434,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter,
 	if (sme_get_is_ese_feature_enabled(hdd_ctx->hHal) &&
 	    hdd_is_okc_mode_enabled(hdd_ctx) &&
 	    sme_get_is_ft_feature_enabled(hdd_ctx->hHal)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_WARN,
 			  "%s: OKC/ESE/11R are supported simultaneously hence this operation is not permitted!",
 			  __func__);
 		ret = -EPERM;
@@ -4452,8 +4452,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_OKC_FEATURE_ENABLED_MIN,
 			  CFG_OKC_FEATURE_ENABLED_MAX);
@@ -4463,8 +4463,8 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter,
 
 	if ((okcMode < CFG_OKC_FEATURE_ENABLED_MIN) ||
 	    (okcMode > CFG_OKC_FEATURE_ENABLED_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Okc mode value %d is out of range (Min: %d Max: %d)",
 			  okcMode,
 			  CFG_OKC_FEATURE_ENABLED_MIN,
@@ -4472,7 +4472,7 @@ static int drv_cmd_set_okc_mode(hdd_adapter_t *adapter,
 		ret = -EINVAL;
 		goto exit;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to change okc mode = %d",
 		  __func__, okcMode);
 
@@ -4497,8 +4497,8 @@ static int drv_cmd_get_roam_scan_control(hdd_adapter_t *adapter,
 			command, roamScanControl);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -4518,8 +4518,8 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter,
 
 	bcMode = command + 11;
 	if ('1' == *bcMode) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_DEBUG,
 			  FL("BTCOEXMODE %d"), *bcMode);
 		hdd_ctx->btCoexModeSet = true;
 		ret = wlan_hdd_scan_abort(adapter);
@@ -4528,8 +4528,8 @@ static int drv_cmd_bt_coex_mode(hdd_adapter_t *adapter,
 			    FL("Failed to abort existing scan status:%d"), ret);
 		}
 	} else if ('2' == *bcMode) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_DEBUG,
 			  FL("BTCOEXMODE %d"), *bcMode);
 		hdd_ctx->btCoexModeSet = false;
 	}
@@ -4573,8 +4573,8 @@ static int drv_cmd_get_dwell_time(hdd_adapter_t *adapter,
 	ret = hdd_get_dwell_time(pCfg, command, extra, sizeof(extra), &len);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (ret != 0 || copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -4609,7 +4609,7 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter,
 
 	pHddCtx = WLAN_HDD_GET_CTX(adapter);
 	if (0 != wlan_hdd_validate_context(pHddCtx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			"%s pHddCtx is not valid, Unable to set miracast mode",
 			 __func__);
 		return -EINVAL;
@@ -4625,8 +4625,8 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range ",
 			  __func__);
 		ret = -EINVAL;
@@ -4635,8 +4635,8 @@ static int drv_cmd_miracast(hdd_adapter_t *adapter,
 	if ((filterType < WLAN_HDD_DRIVER_MIRACAST_CFG_MIN_VAL)
 	    || (filterType >
 		WLAN_HDD_DRIVER_MIRACAST_CFG_MAX_VAL)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Accepted Values are 0 to 2. 0-Disabled, 1-Source, 2-Sink ",
 			  __func__);
 		ret = -EINVAL;
@@ -4673,15 +4673,15 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter,
 
 	ret = hdd_parse_channellist(value, ChannelList, &numChannels);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to parse channel list information",
 			  __func__);
 		goto exit;
 	}
 	if (numChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: number of channels (%d) supported exceeded max (%d)",
 			  __func__,
 			  numChannels,
@@ -4694,8 +4694,8 @@ static int drv_cmd_set_ccx_roam_scan_channels(hdd_adapter_t *adapter,
 						    ChannelList,
 						    numChannels);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to update channel list information",
 			  __func__);
 		ret = -EINVAL;
@@ -4732,8 +4732,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter,
 
 	/* if not associated, return error */
 	if (eConnectionState_Associated != pHddStaCtx->conn_info.connState) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s:Not associated!", __func__);
 		ret = -EINVAL;
 		goto exit;
@@ -4749,8 +4749,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, TID_MIN_VALUE,
 			  TID_MAX_VALUE);
@@ -4758,28 +4758,28 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter,
 		goto exit;
 	}
 	if ((tid < TID_MIN_VALUE) || (tid > TID_MAX_VALUE)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "tid value %d is out of range (Min: %d Max: %d)",
 			  tid, TID_MIN_VALUE, TID_MAX_VALUE);
 		ret = -EINVAL;
 		goto exit;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD,
-		  CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD,
+		  QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to get tsm stats tid = %d",
 		  __func__, tid);
 	if (QDF_STATUS_SUCCESS !=
 	    hdd_get_tsm_stats(adapter, tid, &tsm_metrics)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to get tsm stats",
 			  __func__);
 		ret = -EFAULT;
 		goto exit;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD,
-		  CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD,
+		  QDF_TRACE_LEVEL_INFO,
 		  "UplinkPktQueueDly(%d) UplinkPktQueueDlyHist[0](%d) UplinkPktQueueDlyHist[1](%d) UplinkPktQueueDlyHist[2](%d) UplinkPktQueueDlyHist[3](%d) UplinkPktTxDly(%u) UplinkPktLoss(%d) UplinkPktCount(%d) RoamingCount(%d) RoamingDly(%d)",
 		  tsm_metrics.UplinkPktQueueDly,
 		  tsm_metrics.UplinkPktQueueDlyHist[0],
@@ -4813,8 +4813,8 @@ static int drv_cmd_get_tsm_stats(hdd_adapter_t *adapter,
 			tsm_metrics.RoamingDly);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -4838,16 +4838,16 @@ static int drv_cmd_set_cckm_ie(hdd_adapter_t *adapter,
 
 	ret = hdd_parse_get_cckm_ie(value, &cckmIe, &cckmIeLen);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to parse cckm ie data",
 			  __func__);
 		goto exit;
 	}
 
 	if (cckmIeLen > DOT11F_IE_RSN_MAX_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: CCKM Ie input length is more than max[%d]",
 			  __func__, DOT11F_IE_RSN_MAX_LEN);
 		if (NULL != cckmIe) {
@@ -4889,15 +4889,15 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter,
 
 	ret = hdd_parse_ese_beacon_req(value, &eseBcnReq);
 	if (ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to parse ese beacon req",
 			  __func__);
 		goto exit;
 	}
 
 	if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(adapter))) {
-		hddLog(CDF_TRACE_LEVEL_INFO, FL("Not associated"));
+		hddLog(QDF_TRACE_LEVEL_INFO, FL("Not associated"));
 		hdd_indicate_ese_bcn_report_no_results(adapter,
 			eseBcnReq.bcnReq[0].measurementToken,
 			0x02, /* BIT(1) set for measurement done */
@@ -4910,14 +4910,14 @@ static int drv_cmd_ccx_beacon_req(hdd_adapter_t *adapter,
 					    &eseBcnReq);
 
 	if (QDF_STATUS_E_RESOURCES == status) {
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL("sme_set_ese_beacon_request failed (%d), a request already in progress"),
 		       status);
 		ret = -EBUSY;
 		goto exit;
 	} else if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_set_ese_beacon_request failed (%d)",
 			  __func__, status);
 		ret = -EINVAL;
@@ -4970,8 +4970,8 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter,
 
 	status = hdd_parse_setmaxtxpower_command(value, &txPower);
 	if (status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "Invalid MAXTXPOWER command ");
 		ret = -EINVAL;
 		goto exit;
@@ -4987,7 +4987,7 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter,
 		qdf_copy_macaddr(&selfMac,
 				 &adapter->macAddressCurrent);
 
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "Device mode %d max tx power %d selfMac: " MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR " ",
 		       adapter->device_mode, txPower,
 		       MAC_ADDR_ARRAY(selfMac.bytes),
@@ -4996,13 +4996,13 @@ static int drv_cmd_max_tx_power(hdd_adapter_t *adapter,
 		smeStatus = sme_set_max_tx_power(hdd_ctx->hHal,
 						 bssid, selfMac, txPower);
 		if (QDF_STATUS_SUCCESS != status) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s:Set max tx power failed",
 			       __func__);
 			ret = -EINVAL;
 			goto exit;
 		}
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "%s: Set max tx power success",
 		       __func__);
 		qdf_status = hdd_get_next_adapter(hdd_ctx, pAdapterNode,
@@ -5034,8 +5034,8 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter,
 		 * If the input value is greater than max value of datatype,
 		 * then also kstrtou8 fails
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: kstrtou8 failed range [%d - %d]",
 			  __func__, CFG_ROAMING_DFS_CHANNEL_MIN,
 			  CFG_ROAMING_DFS_CHANNEL_MAX);
@@ -5045,8 +5045,8 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter,
 
 	if ((dfsScanMode < CFG_ROAMING_DFS_CHANNEL_MIN) ||
 	    (dfsScanMode > CFG_ROAMING_DFS_CHANNEL_MAX)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "dfsScanMode value %d is out of range (Min: %d Max: %d)",
 			  dfsScanMode,
 			  CFG_ROAMING_DFS_CHANNEL_MIN,
@@ -5055,7 +5055,7 @@ static int drv_cmd_set_dfs_scan_mode(hdd_adapter_t *adapter,
 		goto exit;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received Command to Set DFS Scan Mode = %d",
 		  __func__, dfsScanMode);
 
@@ -5093,8 +5093,8 @@ static int drv_cmd_get_dfs_scan_mode(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, dfsScanMode);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -5117,8 +5117,8 @@ static int drv_cmd_get_link_status(hdd_adapter_t *adapter,
 	len = scnprintf(extra, sizeof(extra), "%s %d", command, value);
 	len = QDF_MIN(priv_data->total_len, len + 1);
 	if (copy_to_user(priv_data->buf, &extra, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+			  QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer",
 			  __func__);
 		ret = -EFAULT;
@@ -5882,7 +5882,7 @@ static int drv_cmd_invalid(hdd_adapter_t *adapter,
 			   uint8_t command_len,
 			   hdd_priv_data_t *priv_data)
 {
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_UNSUPPORTED_IOCTL,
 			 adapter->sessionId, 0));
 
@@ -6190,7 +6190,7 @@ static int hdd_drv_cmd_process(hdd_adapter_t *adapter,
 	int len = 0;
 
 	if (!adapter || !cmd || !priv_data) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: at least 1 param is NULL", __func__);
 		return -EINVAL;
 	}
@@ -6204,7 +6204,7 @@ static int hdd_drv_cmd_process(hdd_adapter_t *adapter,
 		len = strlen(cmd_i);
 
 		if (!handler) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: no. %d handler is NULL", __func__, i);
 			return -EINVAL;
 		}
@@ -6247,7 +6247,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter,
 	/* copy to local struct to avoid numerous changes to legacy code */
 	if (priv_data->total_len <= 0 ||
 	    priv_data->total_len > WLAN_PRIV_DATA_MAX_LEN) {
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s:invalid priv_data.total_len(%d)!!!", __func__,
 		       priv_data->total_len);
 		ret = -EINVAL;
@@ -6257,7 +6257,7 @@ static int hdd_driver_command(hdd_adapter_t *adapter,
 	/* Allocate +1 for '\0' */
 	command = kmalloc(priv_data->total_len + 1, GFP_KERNEL);
 	if (!command) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: failed to allocate memory", __func__);
 		ret = -ENOMEM;
 		goto exit;
@@ -6360,14 +6360,14 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 	ENTER();
 
 	if (dev != adapter->dev) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s: HDD adapter/dev inconsistency", __func__);
 		ret = -ENODEV;
 		goto exit;
 	}
 
 	if ((!ifr) || (!ifr->ifr_data)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid data", __func__);
 		ret = -EINVAL;
 		goto exit;
@@ -6394,7 +6394,7 @@ static int __hdd_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 			ret = hdd_driver_ioctl(adapter, ifr);
 		break;
 	default:
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d",
 		       __func__, cmd);
 		ret = -EINVAL;
 		break;
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 8f228d128386..d206f92c7736 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -507,13 +507,13 @@ uint32_t wlan_hdd_stub_addr_to_priv(void *ptr)
 	(((struct hdd_ipa_cld_hdr *) (_data))->iface_id)
 
 #define HDD_IPA_LOG(LVL, fmt, args ...) \
-	CDF_TRACE(QDF_MODULE_ID_HDD, LVL, \
+	QDF_TRACE(QDF_MODULE_ID_HDD, LVL, \
 		  "%s:%d: "fmt, __func__, __LINE__, ## args)
 
 #define HDD_IPA_DBG_DUMP(_lvl, _prefix, _buf, _len) \
 	do { \
-		CDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
-		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \
+		QDF_TRACE(QDF_MODULE_ID_HDD, _lvl, "%s:", _prefix); \
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_HDD, _lvl, _buf, _len); \
 	} while (0)
 
 #define HDD_IPA_IS_CONFIG_ENABLED(_hdd_ctx, _mask) \
@@ -717,7 +717,7 @@ static void hdd_ipa_uc_rt_debug_host_fill(void *ctext)
 		return;
 
 	if (!hdd_ctx->hdd_ipa || !hdd_ipa_uc_is_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA UC is not enabled", __func__);
 		return;
 	}
@@ -763,14 +763,14 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx)
 
 	hdd_ipa = hdd_ctx->hdd_ipa;
 	if (!hdd_ipa || !hdd_ipa_uc_is_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA UC is not enabled", __func__);
 		return;
 	}
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 		"========= WLAN-IPA DEBUG BUF DUMP ==========\n");
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 		"     TM     :   EXEP   :   DROP   :   NETS   :   MCBC   :   TXFD   :   DSTR   :   DSCD\n");
 
 	qdf_mutex_acquire(&hdd_ipa->rt_debug_lock);
@@ -780,7 +780,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx)
 		dump_index = (hdd_ipa->rt_buf_fill_index + dump_count) %
 			HDD_IPA_UC_RT_DEBUG_BUF_COUNT;
 		dump_info = &hdd_ipa->rt_bug_buffer[dump_index];
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"%12lu:%10llu:%10llu:%10llu:%10llu:%10llu:%10llu:%10llu\n",
 			dump_info->time, dump_info->ipa_excep_count,
 			dump_info->rx_drop_count, dump_info->net_sent_count,
@@ -789,7 +789,7 @@ void hdd_ipa_uc_rt_debug_host_dump(hdd_context_t *hdd_ctx)
 			dump_info->rx_discard_count);
 	}
 	qdf_mutex_release(&hdd_ipa->rt_debug_lock);
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 		"======= WLAN-IPA DEBUG BUF DUMP END ========\n");
 }
 
@@ -813,7 +813,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext)
 		return;
 
 	if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA RT debug is not enabled", __func__);
 		return;
 	}
@@ -824,7 +824,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext)
 	dummy_ptr = kmalloc(HDD_IPA_UC_DEBUG_DUMMY_MEM_SIZE,
 		GFP_KERNEL | GFP_ATOMIC);
 	if (!dummy_ptr) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL,
 			"%s: Dummy alloc fail", __func__);
 		hdd_ipa_uc_rt_debug_host_dump(hdd_ctx);
 		hdd_ipa_uc_stat_request(
@@ -849,7 +849,7 @@ static void hdd_ipa_uc_rt_debug_handler(void *ctext)
 void hdd_ipa_uc_rt_debug_destructor(struct sk_buff *skb)
 {
 	if (!ghdd_ipa) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"%s: invalid hdd context", __func__);
 		return;
 	}
@@ -877,7 +877,7 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx)
 	qdf_mutex_destroy(&hdd_ipa->rt_debug_lock);
 
 	if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA RT debug is not enabled", __func__);
 		return;
 	}
@@ -919,7 +919,7 @@ static void hdd_ipa_uc_rt_debug_init(hdd_context_t *hdd_ctx)
 
 	/* Reatime debug enable on feature enable */
 	if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA RT debug is not enabled", __func__);
 		return;
 	}
@@ -1023,7 +1023,7 @@ static bool hdd_ipa_uc_find_add_assoc_sta(struct hdd_ipa_priv *hdd_ipa,
 		}
 	}
 	if (sta_add && sta_found) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: STA ID %d already exist, cannot add",
 			    __func__, sta_id);
 		return sta_found;
@@ -1038,7 +1038,7 @@ static bool hdd_ipa_uc_find_add_assoc_sta(struct hdd_ipa_priv *hdd_ipa,
 		}
 	}
 	if (!sta_add && !sta_found) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: STA ID %d does not exist, cannot delete",
 			    __func__, sta_id);
 		return sta_found;
@@ -1069,19 +1069,19 @@ static int hdd_ipa_uc_enable_pipes(struct hdd_ipa_priv *hdd_ipa)
 	p_cds_contextType cds_ctx = hdd_ipa->hdd_ctx->pcds_context;
 
 	/* ACTIVATE TX PIPE */
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: Enable TX PIPE(tx_pipe_handle=%d)",
 			__func__, hdd_ipa->tx_pipe_handle);
 	result = ipa_enable_wdi_pipe(hdd_ipa->tx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Enable TX PIPE fail, code %d",
 			    __func__, result);
 		return result;
 	}
 	result = ipa_resume_wdi_pipe(hdd_ipa->tx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Resume TX PIPE fail, code %d",
 			    __func__, result);
 		return result;
@@ -1089,19 +1089,19 @@ static int hdd_ipa_uc_enable_pipes(struct hdd_ipa_priv *hdd_ipa)
 	ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, true, true);
 
 	/* ACTIVATE RX PIPE */
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: Enable RX PIPE(rx_pipe_handle=%d)",
 			__func__, hdd_ipa->rx_pipe_handle);
 	result = ipa_enable_wdi_pipe(hdd_ipa->rx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Enable RX PIPE fail, code %d",
 			    __func__, result);
 		return result;
 	}
 	result = ipa_resume_wdi_pipe(hdd_ipa->rx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Resume RX PIPE fail, code %d",
 			    __func__, result);
 		return result;
@@ -1123,33 +1123,33 @@ static int hdd_ipa_uc_disable_pipes(struct hdd_ipa_priv *hdd_ipa)
 
 	hdd_ipa->ipa_pipes_down = true;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable RX PIPE", __func__);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable RX PIPE", __func__);
 	result = ipa_suspend_wdi_pipe(hdd_ipa->rx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Suspend RX PIPE fail, code %d",
 			    __func__, result);
 		return result;
 	}
 	result = ipa_disable_wdi_pipe(hdd_ipa->rx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Disable RX PIPE fail, code %d",
 			    __func__, result);
 		return result;
 	}
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable TX PIPE", __func__);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable TX PIPE", __func__);
 	result = ipa_suspend_wdi_pipe(hdd_ipa->tx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Suspend TX PIPE fail, code %d",
 			    __func__, result);
 		return result;
 	}
 	result = ipa_disable_wdi_pipe(hdd_ipa->tx_pipe_handle);
 	if (result) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: Disable TX PIPE fail, code %d",
 			    __func__, result);
 		return result;
@@ -1178,7 +1178,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa)
 			 * enable pipe immediately
 			 */
 			if (hdd_ipa_uc_enable_pipes(hdd_ipa)) {
-				HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+				HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 					"%s: IPA WDI Pipe activation failed",
 					__func__);
 				hdd_ipa->resource_loading = false;
@@ -1190,7 +1190,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa)
 		 * Just enabled all the PIPEs
 		 */
 		if (hdd_ipa_uc_enable_pipes(hdd_ipa)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "%s: IPA WDI Pipe activation failed",
 				    __func__);
 			hdd_ipa->resource_loading = false;
@@ -1199,7 +1199,7 @@ static int hdd_ipa_uc_handle_first_con(struct hdd_ipa_priv *hdd_ipa)
 		hdd_ipa->resource_loading = false;
 	}
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s: IPA WDI Pipes activated successfully", __func__);
 	return 0;
 }
@@ -1215,9 +1215,9 @@ static void hdd_ipa_uc_handle_last_discon(struct hdd_ipa_priv *hdd_ipa)
 	p_cds_contextType cds_ctx = hdd_ipa->hdd_ctx->pcds_context;
 
 	hdd_ipa->resource_unloading = true;
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable FW RX PIPE", __func__);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable FW RX PIPE", __func__);
 	ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, false, false);
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Disable FW TX PIPE", __func__);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Disable FW TX PIPE", __func__);
 	ol_txrx_ipa_uc_set_active(cds_ctx->pdev_txrx_ctx, false, true);
 }
 
@@ -1241,14 +1241,14 @@ hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event)
 	 */
 	status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx);
 	if (0 != status) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
 		return;
 	}
 
 	if (!hdd_ipa_is_rm_enabled(hdd_ipa->hdd_ctx))
 		return;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s, event code %d",
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s, event code %d",
 		    __func__, event);
 
 	switch (event) {
@@ -1269,7 +1269,7 @@ hdd_ipa_uc_rm_notify_handler(void *context, enum ipa_rm_event event)
 		break;
 
 	default:
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s, invalid event code %d", __func__, event);
 		break;
 	}
@@ -1296,7 +1296,7 @@ static void hdd_ipa_uc_rm_notify_defer(struct work_struct *work)
 
 	cds_ssr_protect(__func__);
 	event = uc_rm_work->event;
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 		"%s, posted event %d", __func__, event);
 
 	hdd_ipa_uc_rm_notify_handler(hdd_ipa, event);
@@ -1317,10 +1317,10 @@ static void hdd_ipa_uc_proc_pending_event(struct hdd_ipa_priv *hdd_ipa)
 	struct ipa_uc_pending_event *pending_event = NULL;
 
 	pending_event_count = qdf_list_size(&hdd_ipa->pending_event);
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 		"%s, Pending Event Count %d", __func__, pending_event_count);
 	if (!pending_event_count) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			"%s, No Pending Event", __func__);
 		return;
 	}
@@ -1357,12 +1357,12 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (!op_msg || !usr_ctxt) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__);
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s, INVALID ARG", __func__);
 		return;
 	}
 
 	if (HDD_IPA_UC_OPCODE_MAX <= msg->op_code) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s, INVALID OPCODE %d", __func__, msg->op_code);
 		return;
 	}
@@ -1374,14 +1374,14 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 	 */
 	status = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != status) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
 		cdf_mem_free(op_msg);
 		return;
 	}
 
 	hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
 		    "%s, OPCODE %s", __func__, op_string[msg->op_code]);
 
 	if ((HDD_IPA_UC_OPCODE_TX_RESUME == msg->op_code) ||
@@ -1422,7 +1422,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 		(HDD_IPA_UC_STAT_REASON_DEBUG == hdd_ipa->stat_req_reason)) {
 
 		/* STATs from host */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST CE ====\n"
 			  "CE RING BASE: 0x%llx\n"
 			  "CE RING SIZE: %d\n"
@@ -1430,7 +1430,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  (unsigned long long)hdd_ipa->ce_sr_base_paddr,
 			  hdd_ipa->ce_sr_ring_size,
 			  (unsigned long long)hdd_ipa->ce_reg_paddr);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST TX ====\n"
 			  "COMP RING BASE: 0x%llx\n"
 			  "COMP RING SIZE: %d\n"
@@ -1440,7 +1440,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  hdd_ipa->tx_comp_ring_size,
 			  hdd_ipa->tx_num_alloc_buffer,
 			  (unsigned long long)hdd_ipa->tx_comp_doorbell_paddr);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST RX ====\n"
 			  "IND RING BASE: 0x%llx\n"
 			  "IND RING SIZE: %d\n"
@@ -1456,7 +1456,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  hdd_ipa->stats.num_rx_excep,
 			  hdd_ipa->stats.num_tx_bcmc,
 			  (unsigned long long)hdd_ipa->stats.num_tx_bcmc_err);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_HOST CONTROL ====\n"
 			  "SAP NUM STAs: %d\n"
 			  "STA CONNECTED: %d\n"
@@ -1476,7 +1476,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 		/* STATs from FW */
 		uc_fw_stat = (struct ipa_uc_fw_stats *)
 			     ((uint8_t *)op_msg + sizeof(struct op_msg_type));
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_FW TX ====\n"
 			  "COMP RING BASE: 0x%x\n"
 			  "COMP RING SIZE: %d\n"
@@ -1497,7 +1497,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  uc_fw_stat->tx_pkts_enqueued,
 			  uc_fw_stat->tx_pkts_completed,
 			  uc_fw_stat->tx_is_suspend, uc_fw_stat->tx_reserved);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC WLAN_FW RX ====\n"
 			  "IND RING BASE: 0x%x\n"
 			  "IND RING SIZE: %d\n"
@@ -1528,7 +1528,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  uc_fw_stat->rx_is_suspend, uc_fw_stat->rx_reserved);
 		/* STATs from IPA */
 		ipa_get_wdi_stats(&ipa_stat);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC IPA TX ====\n"
 			  "NUM PROCD : %d\n"
 			  "CE DBELL : 0x%x\n"
@@ -1564,7 +1564,7 @@ static void hdd_ipa_uc_op_cb(struct op_msg_type *op_msg, void *usr_ctxt)
 			  num_bam_int_in_non_runnning_state,
 			  ipa_stat.tx_ch_stats.num_qmb_int_handled);
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		CDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "==== IPA_UC IPA RX ====\n"
 			  "MAX OST PKT : %d\n"
 			  "NUM PKT PRCSD : %d\n"
@@ -1658,7 +1658,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter,
 	ipa_offload_enable_disable.vdev_id = adapter->sessionId;
 	ipa_offload_enable_disable.enable = enable;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 		"%s: offload_type=%d, vdev_id=%d, enable=%d", __func__,
 		ipa_offload_enable_disable.offload_type,
 		ipa_offload_enable_disable.vdev_id,
@@ -1667,7 +1667,7 @@ static void hdd_ipa_uc_offload_enable_disable(hdd_adapter_t *adapter,
 	if (QDF_STATUS_SUCCESS !=
 		sme_ipa_offload_enable_disable(WLAN_HDD_GET_HAL_CTX(adapter),
 			adapter->sessionId, &ipa_offload_enable_disable)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"%s: Failure to enable IPA offload \
 			(offload_type=%d, vdev_id=%d, enable=%d)", __func__,
 			ipa_offload_enable_disable.offload_type,
@@ -1693,7 +1693,7 @@ static void hdd_ipa_uc_fw_op_event_handler(struct work_struct *work)
 
 	msg = uc_op_work->msg;
 	uc_op_work->msg = NULL;
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 			"%s, posted msg %d", __func__, msg->op_code);
 
 	hdd_ipa_uc_op_cb(msg, hdd_ipa->hdd_ctx);
@@ -1720,7 +1720,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx)
 
 	status = wlan_hdd_validate_context(hdd_ctx);
 	if (0 != status) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
 		goto end;
 	}
 
@@ -1731,7 +1731,7 @@ static void hdd_ipa_uc_op_event_handler(uint8_t *op_msg, void *hdd_ctx)
 		goto end;
 
 	if (HDD_IPA_UC_OPCODE_MAX <= msg->op_code) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s: Invalid OP Code (%d)",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s: Invalid OP Code (%d)",
 				__func__, msg->op_code);
 		goto end;
 	}
@@ -1806,7 +1806,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx)
 	pipe_in.sys.ipa_ep_cfg.hdr_ext.hdr_little_endian = true;
 	pipe_in.sys.notify = hdd_ipa_i2w_cb;
 	if (!hdd_ipa_is_rm_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "%s: IPA RM DISABLED, IPA AWAKE", __func__);
 		pipe_in.sys.keep_ipa_awake = true;
 	}
@@ -1825,7 +1825,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx)
 	ipa_ctxt->tx_comp_doorbell_paddr = pipe_out.uc_door_bell_pa;
 	/* WLAN TX PIPE Handle */
 	ipa_ctxt->tx_pipe_handle = pipe_out.clnt_hdl;
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 		    "TX : CRBPA 0x%x, CRS %d, CERBPA 0x%x, CEDPA 0x%x,"
 		    " CERZ %d, NB %d, CDBPAD 0x%x",
 		    (unsigned int)pipe_in.u.dl.comp_ring_base_pa,
@@ -1847,7 +1847,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx)
 				   sizeof(struct sps_iovec);
 	pipe_in.sys.notify = hdd_ipa_w2i_cb;
 	if (!hdd_ipa_is_rm_enabled(hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: IPA RM DISABLED, IPA AWAKE", __func__);
 		pipe_in.sys.keep_ipa_awake = true;
 	}
@@ -1859,7 +1859,7 @@ static QDF_STATUS hdd_ipa_uc_ol_init(hdd_context_t *hdd_ctx)
 	ipa_connect_wdi_pipe(&pipe_in, &pipe_out);
 	ipa_ctxt->rx_ready_doorbell_paddr = pipe_out.uc_door_bell_pa;
 	ipa_ctxt->rx_pipe_handle = pipe_out.clnt_hdl;
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 		    "RX : RRBPA 0x%x, RRS %d, PDIPA 0x%x, RDY_DB_PAD 0x%x",
 		    (unsigned int)pipe_in.u.ul.rdy_ring_base_pa,
 		    pipe_in.u.ul.rdy_ring_size,
@@ -1902,11 +1902,11 @@ void hdd_ipa_uc_force_pipe_shutdown(hdd_context_t *hdd_ctx)
 
 	hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa;
 	if (false == hdd_ipa->ipa_pipes_down) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				"IPA pipes are not down yet, force shutdown");
 		hdd_ipa_uc_disable_pipes(hdd_ipa);
 	} else {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"IPA pipes are down, do nothing");
 	}
 
@@ -2198,7 +2198,7 @@ static void hdd_ipa_rm_notify(void *user_data, enum ipa_rm_event event,
 	if (!hdd_ipa_is_rm_enabled(hdd_ipa->hdd_ctx))
 		return;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Evt: %d", event);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Evt: %d", event);
 
 	switch (event) {
 	case IPA_RM_RESOURCE_GRANTED:
@@ -2218,12 +2218,12 @@ static void hdd_ipa_rm_notify(void *user_data, enum ipa_rm_event event,
 		break;
 
 	case IPA_RM_RESOURCE_RELEASED:
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "RM Release");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "RM Release");
 		hdd_ipa->resource_unloading = false;
 		break;
 
 	default:
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Unknown RM Evt: %d", event);
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Unknown RM Evt: %d", event);
 		break;
 	}
 }
@@ -2254,13 +2254,13 @@ static int hdd_ipa_rm_cons_request(void)
 	int ret = 0;
 
 	if (ghdd_ipa->resource_loading) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL,
 			    "%s: IPA resource loading in progress",
 			    __func__);
 		ghdd_ipa->pending_cons_req = true;
 		ret = -EINPROGRESS;
 	} else if (ghdd_ipa->resource_unloading) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL,
 				"%s: IPA resource unloading in progress",
 				__func__);
 		ghdd_ipa->pending_cons_req = true;
@@ -2316,14 +2316,14 @@ int hdd_ipa_set_perf_level(hdd_context_t *hdd_ctx, uint64_t tx_packets,
 		hdd_ipa->curr_prod_bw, next_prod_bw);
 
 	if (hdd_ipa->curr_cons_bw != next_cons_bw) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "Requesting CONS perf curr: %d, next: %d",
 			    hdd_ipa->curr_cons_bw, next_cons_bw);
 		profile.max_supported_bandwidth_mbps = next_cons_bw;
 		ret = ipa_rm_set_perf_profile(IPA_RM_RESOURCE_WLAN_CONS,
 					      &profile);
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "RM CONS set perf profile failed: %d", ret);
 
 			return ret;
@@ -2333,14 +2333,14 @@ int hdd_ipa_set_perf_level(hdd_context_t *hdd_ctx, uint64_t tx_packets,
 	}
 
 	if (hdd_ipa->curr_prod_bw != next_prod_bw) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "Requesting PROD perf curr: %d, next: %d",
 			    hdd_ipa->curr_prod_bw, next_prod_bw);
 		profile.max_supported_bandwidth_mbps = next_prod_bw;
 		ret = ipa_rm_set_perf_profile(IPA_RM_RESOURCE_WLAN_PROD,
 					      &profile);
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "RM PROD set perf profile failed: %d", ret);
 			return ret;
 		}
@@ -2396,7 +2396,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa)
 
 	ret = ipa_rm_create_resource(&create_params);
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "Create RM resource failed: %d", ret);
 		goto setup_rm_fail;
 	}
@@ -2409,7 +2409,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa)
 
 	ret = ipa_rm_create_resource(&create_params);
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "Create RM CONS resource failed: %d", ret);
 		goto delete_prod;
 	}
@@ -2420,7 +2420,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa)
 	ret = ipa_rm_inactivity_timer_init(IPA_RM_RESOURCE_WLAN_PROD,
 					   HDD_IPA_RX_INACTIVITY_MSEC_DELAY);
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Timer init failed: %d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Timer init failed: %d",
 			    ret);
 		goto timer_init_failed;
 	}
@@ -2429,7 +2429,7 @@ static int hdd_ipa_setup_rm(struct hdd_ipa_priv *hdd_ipa)
 	ret = hdd_ipa_set_perf_level(hdd_ipa->hdd_ctx, 0, 0);
 
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "Set perf level failed: %d", ret);
 		goto set_perf_failed;
 	}
@@ -2489,12 +2489,12 @@ static void hdd_ipa_destroy_rm_resource(struct hdd_ipa_priv *hdd_ipa)
 
 	ret = ipa_rm_delete_resource(IPA_RM_RESOURCE_WLAN_PROD);
 	if (ret)
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "RM PROD resource delete failed %d", ret);
 
 	ret = ipa_rm_delete_resource(IPA_RM_RESOURCE_WLAN_CONS);
 	if (ret)
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "RM CONS resource delete failed %d", ret);
 }
 
@@ -2515,7 +2515,7 @@ static void hdd_ipa_send_skb_to_network(cdf_nbuf_t skb,
 	unsigned int cpu_index;
 
 	if (!adapter || adapter->magic != WLAN_HDD_ADAPTER_MAGIC) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_LOW, "Invalid adapter: 0x%p",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_LOW, "Invalid adapter: 0x%p",
 			    adapter);
 		HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa);
 		cdf_nbuf_free(skb);
@@ -2575,7 +2575,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 		if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
 			session_id = (uint8_t)skb->cb[0];
 			iface_id = vdev_to_iface[session_id];
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 				"IPA_RECEIVE: session_id=%u, iface_id=%u",
 				session_id, iface_id);
 		} else {
@@ -2583,10 +2583,10 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 		}
 
 		if (iface_id >= HDD_IPA_MAX_IFACE) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "IPA_RECEIVE: Invalid iface_id: %u",
 				    iface_id);
-			HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_INFO_HIGH,
+			HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_INFO_HIGH,
 				"w2i -- skb", skb->data, 8);
 			HDD_IPA_INCREASE_INTERNAL_DROP_COUNT(hdd_ipa);
 			cdf_nbuf_free(skb);
@@ -2596,7 +2596,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 		iface_context = &hdd_ipa->iface_context[iface_id];
 		adapter = iface_context->adapter;
 
-		HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_DEBUG,
+		HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_DEBUG,
 				"w2i -- skb", skb->data, 8);
 		if (hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
 			hdd_ipa->stats.num_rx_excep++;
@@ -2625,7 +2625,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 
 			if (fw_desc & HDD_IPA_FW_RX_DESC_FORWARD_M) {
 				HDD_IPA_LOG(
-					CDF_TRACE_LEVEL_DEBUG,
+					QDF_TRACE_LEVEL_DEBUG,
 					"Forward packet to Tx (fw_desc=%d)",
 					fw_desc);
 				copy = cdf_nbuf_copy(skb);
@@ -2636,7 +2636,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 						adapter->dev);
 					if (ret) {
 						HDD_IPA_LOG(
-							CDF_TRACE_LEVEL_DEBUG,
+							QDF_TRACE_LEVEL_DEBUG,
 							"Forward packet tx fail");
 						hdd_ipa->stats.
 							num_tx_bcmc_err++;
@@ -2654,7 +2654,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 			}
 
 		} else {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 				"Intra-BSS FWD is disabled-skip forward to Tx");
 		}
 
@@ -2662,7 +2662,7 @@ static void hdd_ipa_w2i_cb(void *priv, enum ipa_dp_evt_type evt,
 		break;
 
 	default:
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "w2i cb wrong event: 0x%x", evt);
 		return;
 	}
@@ -2678,7 +2678,7 @@ void hdd_ipa_nbuf_cb(cdf_nbuf_t skb)
 {
 	struct hdd_ipa_priv *hdd_ipa = ghdd_ipa;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb)));
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "%p", wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb)));
 	/* FIXME: This is broken; PRIV_DATA is now 31 bits */
 	ipa_free_skb((struct ipa_rx_data *)wlan_hdd_stub_priv_to_addr(NBUF_CB_TX_IPA_PRIV(skb)));
 
@@ -2708,7 +2708,7 @@ static void hdd_ipa_send_pkt_to_tl(
 	qdf_spin_lock_bh(&iface_context->interface_lock);
 	adapter = iface_context->adapter;
 	if (!adapter) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_WARN, "Interface Down");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_WARN, "Interface Down");
 		ipa_free_skb(ipa_tx_desc);
 		iface_context->stats.num_tx_drop++;
 		qdf_spin_unlock_bh(&iface_context->interface_lock);
@@ -2757,7 +2757,7 @@ static void hdd_ipa_send_pkt_to_tl(
 	skb = ol_tx_send_ipa_data_frame(iface_context->tl_context,
 					 ipa_tx_desc->skb);
 	if (skb) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG, "TLSHIM tx fail");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG, "TLSHIM tx fail");
 		ipa_free_skb(ipa_tx_desc);
 		iface_context->stats.num_tx_err++;
 		hdd_ipa_rm_try_release(hdd_ipa);
@@ -2848,7 +2848,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt,
 	 */
 	status = wlan_hdd_validate_context(hdd_ipa->hdd_ctx);
 	if (0 != status) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "HDD context is not valid");
 		ipa_free_skb(ipa_tx_desc);
 		iface_context->stats.num_tx_drop++;
 		return;
@@ -2856,7 +2856,7 @@ static void hdd_ipa_i2w_cb(void *priv, enum ipa_dp_evt_type evt,
 
 	skb = ipa_tx_desc->skb;
 
-	HDD_IPA_DBG_DUMP(CDF_TRACE_LEVEL_DEBUG, "i2w", skb->data, 8);
+	HDD_IPA_DBG_DUMP(QDF_TRACE_LEVEL_DEBUG, "i2w", skb->data, 8);
 
 	/*
 	 * If PROD resource is not requested here then there may be cases where
@@ -3010,7 +3010,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa)
 
 		ret = ipa_setup_sys_pipe(ipa, &(hdd_ipa->sys_pipe[i].conn_hdl));
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Failed for pipe %d"
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Failed for pipe %d"
 				    " ret: %d", i, ret);
 			goto setup_sys_pipe_fail;
 		}
@@ -3043,7 +3043,7 @@ static int hdd_ipa_setup_sys_pipe(struct hdd_ipa_priv *hdd_ipa)
 
 		ret = ipa_setup_sys_pipe(ipa, &(hdd_ipa->sys_pipe[i].conn_hdl));
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 					"Failed for RX pipe: %d", ret);
 			goto setup_sys_pipe_fail;
 		}
@@ -3078,7 +3078,7 @@ static void hdd_ipa_teardown_sys_pipe(struct hdd_ipa_priv *hdd_ipa)
 				ipa_teardown_sys_pipe(hdd_ipa->sys_pipe[i].
 						      conn_hdl);
 			if (ret)
-				HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Failed: %d",
+				HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Failed: %d",
 					    ret);
 
 			hdd_ipa->sys_pipe[i].conn_hdl_valid = 0;
@@ -3116,7 +3116,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa,
 	tx_prop =
 		cdf_mem_malloc(sizeof(struct ipa_ioc_tx_intf_prop) * num_prop);
 	if (!tx_prop) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "tx_prop allocation failed");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "tx_prop allocation failed");
 		goto register_interface_fail;
 	}
 
@@ -3124,7 +3124,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa,
 	rx_prop =
 		cdf_mem_malloc(sizeof(struct ipa_ioc_rx_intf_prop) * num_prop);
 	if (!rx_prop) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "rx_prop allocation failed");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "rx_prop allocation failed");
 		goto register_interface_fail;
 	}
 
@@ -3208,16 +3208,16 @@ static void hdd_ipa_remove_header(char *name)
 	strlcpy(hdrlookup.name, name, sizeof(hdrlookup.name));
 	ret = ipa_get_hdr(&hdrlookup);
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Hdr deleted already %s, %d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Hdr deleted already %s, %d",
 			    name, ret);
 		return;
 	}
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "hdl: 0x%x", hdrlookup.hdl);
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "hdl: 0x%x", hdrlookup.hdl);
 	len = sizeof(struct ipa_ioc_del_hdr) + sizeof(struct ipa_hdr_del) * 1;
 	ipa_hdr = (struct ipa_ioc_del_hdr *)cdf_mem_malloc(len);
 	if (ipa_hdr == NULL) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "ipa_hdr allocation failed");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "ipa_hdr allocation failed");
 		return;
 	}
 	ipa_hdr->num_hdls = 1;
@@ -3226,7 +3226,7 @@ static void hdd_ipa_remove_header(char *name)
 	ipa_hdr->hdl[0].status = -1;
 	ret = ipa_del_hdr(ipa_hdr);
 	if (ret != 0)
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "Delete header failed: %d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "Delete header failed: %d",
 			    ret);
 
 	cdf_mem_free(ipa_hdr);
@@ -3253,14 +3253,14 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa,
 
 	ifname = adapter->dev->name;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "Add Partial hdr: %s, %pM",
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "Add Partial hdr: %s, %pM",
 		    ifname, mac_addr);
 
 	/* dynamically allocate the memory to add the hdrs */
 	ipa_hdr = cdf_mem_malloc(sizeof(struct ipa_ioc_add_hdr)
 				 + sizeof(struct ipa_hdr_add));
 	if (!ipa_hdr) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "%s: ipa_hdr allocation failed", ifname);
 		ret = -ENOMEM;
 		goto end;
@@ -3274,7 +3274,7 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa,
 		memcpy(uc_tx_hdr, &ipa_uc_tx_hdr, HDD_IPA_UC_WLAN_TX_HDR_LEN);
 		memcpy(uc_tx_hdr->eth.h_source, mac_addr, ETH_ALEN);
 		uc_tx_hdr->ipa_hd.vdev_id = iface_context->adapter->sessionId;
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_DEBUG,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_DEBUG,
 			"ifname=%s, vdev_id=%d",
 			ifname, uc_tx_hdr->ipa_hd.vdev_id);
 		snprintf(ipa_hdr->hdr[0].name, IPA_RESOURCE_NAME_MAX, "%s%s",
@@ -3308,12 +3308,12 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa,
 		ret = ipa_add_hdr(ipa_hdr);
 	}
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "%s IPv4 add hdr failed: %d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "%s IPv4 add hdr failed: %d",
 			    ifname, ret);
 		goto end;
 	}
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: IPv4 hdr_hdl: 0x%x",
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPv4 hdr_hdl: 0x%x",
 		    ipa_hdr->hdr[0].name, ipa_hdr->hdr[0].hdr_hdl);
 
 	if (hdd_ipa_is_ipv6_enabled(hdd_ipa->hdd_ctx)) {
@@ -3332,12 +3332,12 @@ static int hdd_ipa_add_header_info(struct hdd_ipa_priv *hdd_ipa,
 
 		ret = ipa_add_hdr(ipa_hdr);
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "%s: IPv6 add hdr failed: %d", ifname, ret);
 			goto clean_ipv4_hdr;
 		}
 
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: IPv6 hdr_hdl: 0x%x",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: IPv6 hdr_hdl: 0x%x",
 			    ipa_hdr->hdr[0].name, ipa_hdr->hdr[0].hdr_hdl);
 	}
 
@@ -3381,7 +3381,7 @@ static void hdd_ipa_clean_hdr(hdd_adapter_t *adapter)
 	/* unregister the interface with IPA */
 	ret = ipa_deregister_intf(adapter->dev->name);
 	if (ret)
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "%s: ipa_deregister_intf fail: %d",
 			    adapter->dev->name, ret);
 }
@@ -3406,7 +3406,7 @@ static void hdd_ipa_cleanup_iface(struct hdd_ipa_iface_context *iface_context)
 	qdf_spin_unlock_bh(&iface_context->interface_lock);
 	iface_context->ifa_address = 0;
 	if (!iface_context->hdd_ipa->num_iface) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			"NUM INTF 0, Invalid");
 		CDF_ASSERT(0);
 	}
@@ -3444,7 +3444,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa,
 	}
 
 	if (iface_context == NULL) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "All the IPA interfaces are in use");
 		ret = -ENOMEM;
 		goto end;
@@ -3456,7 +3456,7 @@ static int hdd_ipa_setup_iface(struct hdd_ipa_priv *hdd_ipa,
 	tl_context = ol_txrx_get_vdev_by_sta_id(sta_id);
 
 	if (tl_context == NULL) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "Not able to get TL context sta_id: %d", sta_id);
 		ret = -EINVAL;
 		goto end;
@@ -3527,7 +3527,7 @@ int hdd_ipa_send_mcc_scc_msg(hdd_context_t *pHddCtx, bool mcc_mode)
 			pAdapter = adapter_node->pAdapter;
 			if (pAdapter->device_mode == WLAN_HDD_INFRA_STATION ||
 				pAdapter->device_mode == WLAN_HDD_SOFTAP) {
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 					"MCC->SCC: Flush TxRx queue(d_mode=%d)",
 					pAdapter->device_mode);
 				hdd_deinit_tx_rx(pAdapter);
@@ -3617,7 +3617,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 	struct ipa_wlan_msg_ex *msg_ex = NULL;
 	int ret;
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: %s evt, MAC: %pM sta_id: %d",
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: %s evt, MAC: %pM sta_id: %d",
 		    adapter->dev->name, hdd_ipa_wlan_event_to_str(type),
 		    mac_addr, sta_id);
 
@@ -3628,7 +3628,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		return -EINVAL;
 
 	if (!hdd_ipa || !hdd_ipa_is_enabled(hdd_ipa->hdd_ctx)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "IPA OFFLOAD NOT ENABLED");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "IPA OFFLOAD NOT ENABLED");
 		return -EINVAL;
 	}
 
@@ -3702,7 +3702,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		qdf_mutex_acquire(&hdd_ipa->event_lock);
 
 		if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: Evt: %d, IPA UC OFFLOAD NOT ENABLED",
 				msg_ex->name, meta.msg_type);
 		} else if ((!hdd_ipa->sap_num_connected_sta) &&
@@ -3711,7 +3711,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 			ret = hdd_ipa_uc_handle_first_con(hdd_ipa);
 			if (ret) {
 				qdf_mutex_release(&hdd_ipa->event_lock);
-				HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+				HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 					"handle 1st con ret %d", ret);
 				hdd_ipa_uc_offload_enable_disable(adapter,
 					SIR_STA_RX_DATA_OFFLOAD, 0);
@@ -3754,7 +3754,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		qdf_mutex_acquire(&hdd_ipa->event_lock);
 		ret = hdd_ipa_setup_iface(hdd_ipa, adapter, sta_id);
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: Evt: %d, Interface setup failed",
 				msg_ex->name, meta.msg_type);
 			qdf_mutex_release(&hdd_ipa->event_lock);
@@ -3774,7 +3774,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		hdd_ipa_cleanup_iface(adapter->ipa_context);
 
 		if (!hdd_ipa->sta_connected) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: Evt: %d, STA already disconnected",
 				msg_ex->name, meta.msg_type);
 			qdf_mutex_release(&hdd_ipa->event_lock);
@@ -3782,7 +3782,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		}
 		hdd_ipa->sta_connected = 0;
 		if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: IPA UC OFFLOAD NOT ENABLED",
 				msg_ex->name);
 		} else {
@@ -3806,7 +3806,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 
 	case WLAN_AP_DISCONNECT:
 		if (!adapter->ipa_context) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: Evt: %d, SAP already disconnected",
 				msg_ex->name, meta.msg_type);
 			return -EINVAL;
@@ -3826,7 +3826,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 				 */
 				hdd_ipa_uc_disable_pipes(hdd_ipa);
 			} else {
-				HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+				HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 					"NO INTF left but still pipe clean up");
 				hdd_ipa_uc_handle_last_discon(hdd_ipa);
 			}
@@ -3841,11 +3841,11 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		break;
 
 	case WLAN_CLIENT_CONNECT_EX:
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%d %d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%d %d",
 			    adapter->dev->ifindex, sta_id);
 
 		if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 				"%s: Evt: %d, IPA UC OFFLOAD NOT ENABLED",
 				adapter->dev->name, meta.msg_type);
 			return 0;
@@ -3854,7 +3854,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		qdf_mutex_acquire(&hdd_ipa->event_lock);
 		if (hdd_ipa_uc_find_add_assoc_sta(hdd_ipa,
 				true, sta_id)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				"%s: STA ID %d found, not valid",
 				adapter->dev->name, sta_id);
 			qdf_mutex_release(&hdd_ipa->event_lock);
@@ -3868,7 +3868,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 			ret = hdd_ipa_uc_handle_first_con(hdd_ipa);
 			if (ret) {
 				qdf_mutex_release(&hdd_ipa->event_lock);
-				HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+				HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 					    "%s: handle 1st con ret %d",
 					    adapter->dev->name, ret);
 				return ret;
@@ -3885,7 +3885,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		msg_ex = cdf_mem_malloc(meta.msg_len);
 
 		if (msg_ex == NULL) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "msg_ex allocation failed");
 			return -ENOMEM;
 		}
@@ -3906,7 +3906,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 		ret = ipa_send_msg(&meta, msg_ex, hdd_ipa_msg_free_fn);
 
 		if (ret) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d : %d",
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d : %d",
 				    msg_ex->name, meta.msg_type, ret);
 			cdf_mem_free(msg_ex);
 			return ret;
@@ -3916,7 +3916,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 
 	case WLAN_CLIENT_DISCONNECT:
 		if (!hdd_ipa_uc_is_enabled(hdd_ipa->hdd_ctx)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 					"%s: IPA UC OFFLOAD NOT ENABLED",
 					msg_ex->name);
 			return 0;
@@ -3924,7 +3924,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 
 		qdf_mutex_acquire(&hdd_ipa->event_lock);
 		if (!hdd_ipa_uc_find_add_assoc_sta(hdd_ipa, false, sta_id)) {
-			HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+			HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 				    "%s: STA ID %d NOT found, not valid",
 				    msg_ex->name, sta_id);
 			qdf_mutex_release(&hdd_ipa->event_lock);
@@ -3949,7 +3949,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 	meta.msg_len = sizeof(struct ipa_wlan_msg);
 	msg = cdf_mem_malloc(meta.msg_len);
 	if (msg == NULL) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR, "msg allocation failed");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR, "msg allocation failed");
 		return -ENOMEM;
 	}
 
@@ -3957,13 +3957,13 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 	strlcpy(msg->name, adapter->dev->name, IPA_RESOURCE_NAME_MAX);
 	memcpy(msg->mac_addr, mac_addr, ETH_ALEN);
 
-	HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d",
+	HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d",
 		    msg->name, meta.msg_type);
 
 	ret = ipa_send_msg(&meta, msg, hdd_ipa_msg_free_fn);
 
 	if (ret) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d",
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO, "%s: Evt: %d fail:%d",
 			    msg->name, meta.msg_type, ret);
 		cdf_mem_free(msg);
 		return ret;
@@ -4015,7 +4015,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx)
 
 	hdd_ipa = cdf_mem_malloc(sizeof(*hdd_ipa));
 	if (!hdd_ipa) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL, "hdd_ipa allocation failed");
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "hdd_ipa allocation failed");
 		goto fail_return;
 	}
 
@@ -4042,7 +4042,7 @@ QDF_STATUS hdd_ipa_init(hdd_context_t *hdd_ctx)
 	    (0 == hdd_ipa->tx_comp_ring_base_paddr) ||
 	    (0 == hdd_ipa->rx_rdy_ring_base_paddr) ||
 	    (0 == hdd_ipa->rx2_rdy_ring_base_paddr)) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_FATAL,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL,
 			"IPA UC resource alloc fail");
 		goto fail_get_resource;
 	}
@@ -4185,7 +4185,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx)
 	 * descriptor in IPA hardware
 	 */
 	if (hdd_ipa->pending_hw_desc_cnt != 0) {
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "IPA Pending write done: %d Waiting!",
 			    hdd_ipa->pending_hw_desc_cnt);
 
@@ -4193,7 +4193,7 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx)
 			usleep_range(100, 100);
 		}
 
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_ERROR,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_ERROR,
 			    "IPA Pending write done: desc: %d %s(%d)!",
 			    hdd_ipa->pending_hw_desc_cnt,
 			    hdd_ipa->pending_hw_desc_cnt == 0 ? "completed"
@@ -4201,10 +4201,10 @@ QDF_STATUS hdd_ipa_cleanup(hdd_context_t *hdd_ctx)
 	}
 	if (hdd_ipa_uc_is_enabled(hdd_ctx)) {
 		hdd_ipa_uc_rt_debug_deinit(hdd_ctx);
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "%s: Disconnect TX PIPE", __func__);
 		ipa_disconnect_wdi_pipe(hdd_ipa->tx_pipe_handle);
-		HDD_IPA_LOG(CDF_TRACE_LEVEL_INFO,
+		HDD_IPA_LOG(QDF_TRACE_LEVEL_INFO,
 			    "%s: Disconnect RX PIPE", __func__);
 		ipa_disconnect_wdi_pipe(hdd_ipa->rx_pipe_handle);
 		qdf_mutex_destroy(&hdd_ipa->event_lock);
diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c
index 36bea4f1a510..7cba52d751ae 100644
--- a/core/hdd/src/wlan_hdd_lro.c
+++ b/core/hdd/src/wlan_hdd_lro.c
@@ -221,7 +221,7 @@ static int hdd_lro_desc_find(hdd_adapter_t *adapter,
 
 	if (!lro_hash_table) {
 		hdd_err("Invalid hash entry");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return -EINVAL;
 	}
 
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 965ef7b036a7..88374037a620 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -56,7 +56,7 @@
 #include "wlan_hdd_power.h"
 #include "wlan_hdd_stats.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 
 #include <net/addrconf.h>
 #include <linux/wireless.h>
@@ -333,14 +333,14 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb,
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	if (NULL == hdd_ctx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("HDD Context Null Pointer"));
-		CDF_ASSERT(0);
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("HDD Context Null Pointer"));
+		QDF_ASSERT(0);
 		return NOTIFY_DONE;
 	}
 	if (cds_is_driver_recovering())
 		return NOTIFY_DONE;
 
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("%s New Net Device State = %lu"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("%s New Net Device State = %lu"),
 	       dev->name, state);
 
 	switch (state) {
@@ -378,7 +378,7 @@ static int __hdd_netdev_notifier_call(struct notifier_block *nb,
 				       FL("Timeout occurred while waiting for abortscan"));
 			}
 		} else {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL("Scan is not Pending from user"));
 		}
 		break;
@@ -484,7 +484,7 @@ uint8_t wlan_hdd_find_opclass(tHalHandle hal, uint8_t channel,
  */
 static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
 {
-	CDF_TRACE_LEVEL level;
+	QDF_TRACE_LEVEL level;
 
 	/*
 	 * if the bitmask is the default value, then a bitmask was not
@@ -496,13 +496,13 @@ static void hdd_cdf_trace_enable(QDF_MODULE_ID moduleId, uint32_t bitmask)
 	}
 
 	/* a mask was specified.  start by disabling all logging */
-	cdf_trace_set_value(moduleId, CDF_TRACE_LEVEL_NONE, 0);
+	qdf_trace_set_value(moduleId, QDF_TRACE_LEVEL_NONE, 0);
 
 	/* now cycle through the bitmask until all "set" bits are serviced */
-	level = CDF_TRACE_LEVEL_FATAL;
+	level = QDF_TRACE_LEVEL_FATAL;
 	while (0 != bitmask) {
 		if (bitmask & 1) {
-			cdf_trace_set_value(moduleId, level, 1);
+			qdf_trace_set_value(moduleId, level, 1);
 		}
 		level++;
 		bitmask >>= 1;
@@ -544,13 +544,13 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx)
 	struct hdd_config *cfg_param = NULL;
 
 	if (NULL == hdd_ctx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("HDD Context is null !!"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("HDD Context is null !!"));
 		return;
 	}
 
 	adapter = hdd_get_adapter(hdd_ctx, WLAN_HDD_INFRA_STATION);
 	if (NULL == adapter) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("adapter is null !!"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("adapter is null !!"));
 		return;
 	}
 
@@ -558,7 +558,7 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx)
 
 	cfg_param = hdd_ctx->config;
 	if (NULL == cfg_param) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("cfg_params not available !!"));
 		return;
 	}
@@ -569,7 +569,7 @@ void hdd_checkandupdate_phymode(hdd_context_t *hdd_ctx)
 		if ((eCSR_DOT11_MODE_AUTO == phyMode) ||
 		    (eCSR_DOT11_MODE_11ac == phyMode) ||
 		    (eCSR_DOT11_MODE_11ac_ONLY == phyMode)) {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL("Setting phymode to 11n!!"));
 			sme_set_phy_mode(WLAN_HDD_GET_HAL_CTX(adapter),
 					 eCSR_DOT11_MODE_11n);
@@ -627,7 +627,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 	hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	if (hdd_ctx == NULL) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("HDD context is null"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -637,7 +637,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->ibssATIMWinSize,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_SET_ATIM_WINDOW_SIZE failed %d"), ret);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -647,7 +647,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->isIbssPowerSaveAllowed,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_SET_POWER_SAVE_ALLOWED failed %d"),
 		       ret);
 		return QDF_STATUS_E_FAILURE;
@@ -658,7 +658,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->
 				  isIbssPowerCollapseAllowed, VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_SET_POWER_COLLAPSE_ALLOWED failed %d"),
 		       ret);
 		return QDF_STATUS_E_FAILURE;
@@ -669,7 +669,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->isIbssAwakeOnTxRx,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_SET_AWAKE_ON_TX_RX failed %d"), ret);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -679,7 +679,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->ibssInactivityCount,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_SET_INACTIVITY_TIME failed %d"), ret);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -689,7 +689,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->ibssTxSpEndInactivityTime,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "WMA_VDEV_IBSS_SET_TXSP_END_INACTIVITY_TIME failed %d"
 			 ),
@@ -702,7 +702,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->ibssPsWarmupTime,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WMA_VDEV_IBSS_PS_SET_WARMUP_TIME_SECS failed %d"),
 		       ret);
 		return QDF_STATUS_E_FAILURE;
@@ -713,7 +713,7 @@ QDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
 				  hdd_ctx->config->ibssPs1RxChainInAtimEnable,
 				  VDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "WMA_VDEV_IBSS_PS_SET_1RX_CHAIN_IN_ATIM_WINDOW failed %d"
 			 ),
@@ -767,7 +767,7 @@ void hdd_update_macaddr(struct hdd_config *config,
 		/* Set locally administered bit */
 		config->intfMacAddr[i].bytes[0] |= 0x02;
 		config->intfMacAddr[i].bytes[3] = macaddr_b3;
-		hddLog(CDF_TRACE_LEVEL_INFO, "config->intfMacAddr[%d]: "
+		hddLog(QDF_TRACE_LEVEL_INFO, "config->intfMacAddr[%d]: "
 		       MAC_ADDRESS_STR, i,
 		       MAC_ADDR_ARRAY(config->intfMacAddr[i].bytes));
 	}
@@ -793,7 +793,7 @@ static void hdd_update_tgt_services(hdd_context_t *hdd_ctx,
 
 #ifdef FEATURE_WLAN_SCAN_PNO
 	/* PNO offload */
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       FL("PNO Capability in f/w = %d"), cfg->pno_offload);
 	if (cfg->pno_offload)
 		config->PnoOffload = true;
@@ -834,7 +834,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx,
 	status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_MPDU_DENSITY, &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get MPDU DENSITY"));
 		value = 0;
 	}
@@ -849,14 +849,14 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx,
 					 cfg->mpdu_density);
 
 		if (status == QDF_STATUS_E_FAILURE)
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set MPDU DENSITY to CCM"));
 	}
 
 	/* get the HT capability info */
 	status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, &val32);
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get HT capability info"));
 		return;
 	}
@@ -914,13 +914,13 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx,
 	val32 = val16;
 	status = sme_cfg_set_int(hdd_ctx->hHal, WNI_CFG_HT_CAP_INFO, val32);
 	if (status != QDF_STATUS_SUCCESS)
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("could not set HT capability to CCM"));
 #define WLAN_HDD_RX_MCS_ALL_NSTREAM_RATES 0xff
 	value = SIZE_OF_SUPPORTED_MCS_SET;
 	if (sme_cfg_get_str(hdd_ctx->hHal, WNI_CFG_SUPPORTED_MCS_SET, mcs_set,
 			    &value) == QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_INFO, FL("Read MCS rate set"));
+		hddLog(QDF_TRACE_LEVEL_INFO, FL("Read MCS rate set"));
 
 		if (pconfig->enable2x2) {
 			for (value = 0; value < cfg->num_rf_chains; value++)
@@ -933,7 +933,7 @@ static void hdd_update_tgt_ht_cap(hdd_context_t *hdd_ctx,
 						mcs_set,
 						SIZE_OF_SUPPORTED_MCS_SET);
 			if (status == QDF_STATUS_E_FAILURE)
-				hddLog(CDF_TRACE_LEVEL_FATAL,
+				hddLog(QDF_TRACE_LEVEL_FATAL,
 				       FL("could not set MCS SET to CCM"));
 		}
 	}
@@ -957,7 +957,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				&value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("could not get MPDU LENGTH"));
 		value = 0;
 	}
 
@@ -972,7 +972,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_max_mpdu);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set VHT MAX MPDU LENGTH"));
 		}
 	}
@@ -983,7 +983,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				&value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get MPDU LENGTH"));
 		value = 0;
 	}
@@ -994,7 +994,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				&value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT LDPC CODING CAP"));
 		value = 0;
 	}
@@ -1006,7 +1006,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_rx_ldpc);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set VHT LDPC CODING CAP to CCM"));
 		}
 	}
@@ -1016,7 +1016,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				&value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get SHORT GI 80MHZ"));
 		value = 0;
 	}
@@ -1028,7 +1028,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_short_gi_80);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set SHORT GI 80MHZ to CCM"));
 		}
 	}
@@ -1039,7 +1039,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get SHORT GI 80 & 160"));
 		value = 0;
 	}
@@ -1048,7 +1048,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 	status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXSTBC, &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT TX STBC"));
 		value = 0;
 	}
@@ -1059,7 +1059,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_tx_stbc);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set the VHT TX STBC to CCM"));
 		}
 	}
@@ -1068,7 +1068,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 	status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_RXSTBC, &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT RX STBC"));
 		value = 0;
 	}
@@ -1079,7 +1079,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_rx_stbc);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set the VHT RX STBC to CCM"));
 		}
 	}
@@ -1089,7 +1089,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT SU BEAMFORMER CAP"));
 		value = 0;
 	}
@@ -1101,7 +1101,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_su_bformer);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set VHT SU BEAMFORMER CAP"));
 		}
 	}
@@ -1115,7 +1115,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 pconfig->enableTxBF);
 
 	if (status == QDF_STATUS_E_FAILURE) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("could not set VHT SU BEAMFORMEE CAP"));
 	}
 
@@ -1124,7 +1124,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT MU BEAMFORMER CAP"));
 		value = 0;
 	}
@@ -1136,7 +1136,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_mu_bformer);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL(
 				  "could not set the VHT MU BEAMFORMER CAP to CCM"
 				 ));
@@ -1148,7 +1148,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT MU BEAMFORMEE CAP"));
 		value = 0;
 	}
@@ -1160,7 +1160,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_mu_bformee);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set VHT MU BEAMFORMER CAP"));
 		}
 	}
@@ -1170,7 +1170,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 				 &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT AMPDU LEN"));
 		value = 0;
 	}
@@ -1189,7 +1189,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_max_ampdu_len_exp);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set the VHT AMPDU LEN EXP"));
 		}
 	}
@@ -1198,7 +1198,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 	status = sme_cfg_get_int(hdd_ctx->hHal, WNI_CFG_VHT_TXOP_PS, &value);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("could not get VHT TXOP PS"));
 		value = 0;
 	}
@@ -1209,7 +1209,7 @@ static void hdd_update_tgt_vht_cap(hdd_context_t *hdd_ctx,
 					 cfg->vht_txop_ps);
 
 		if (status == QDF_STATUS_E_FAILURE) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("could not set the VHT TXOP PS"));
 		}
 	}
@@ -1288,7 +1288,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 	else if ((hdd_ctx->config->nBandCapability != eCSR_BAND_ALL) &&
 		 (temp_band_cap != eCSR_BAND_ALL) &&
 		 (hdd_ctx->config->nBandCapability != temp_band_cap)) {
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       FL("ini BandCapability not supported by the target"));
 	}
 
@@ -1302,7 +1302,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 	if (!qdf_is_macaddr_zero(&cfg->hw_macaddr)) {
 		hdd_update_macaddr(hdd_ctx->config, cfg->hw_macaddr);
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "Invalid MAC passed from target, using MAC from ini file"
 			  MAC_ADDRESS_STR),
@@ -1441,7 +1441,7 @@ static int __hdd_open(struct net_device *dev)
 	hdd_context_t *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int ret;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_OPEN_REQUEST,
 			 adapter->sessionId, adapter->device_mode));
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -1497,7 +1497,7 @@ static int __hdd_stop(struct net_device *dev)
 
 	ENTER();
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD, TRACE_CODE_HDD_STOP_REQUEST,
 			 adapter->sessionId, adapter->device_mode));
 
 	ret = wlan_hdd_validate_context(hdd_ctx);
@@ -1506,14 +1506,14 @@ static int __hdd_stop(struct net_device *dev)
 
 	/* Nothing to be done if the interface is not opened */
 	if (false == test_bit(DEVICE_IFACE_OPENED, &adapter->event_flags)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("NETDEV Interface is not OPENED"));
 		return -ENODEV;
 	}
 
 	/* Make sure the interface is marked as closed */
 	clear_bit(DEVICE_IFACE_OPENED, &adapter->event_flags);
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Disabling OS Tx queues"));
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Disabling OS Tx queues"));
 
 	/*
 	 * Disable TX on the interface, after this hard_start_xmit() will not
@@ -1734,15 +1734,15 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 		return;
 
 	if (dev->flags & IFF_ALLMULTI) {
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL("allow all multicast frames"));
 		adapter->mc_addr_list.mc_cnt = 0;
 	} else {
 		mc_count = netdev_mc_count(dev);
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL("mc_count = %u"), mc_count);
 		if (mc_count > WLAN_HDD_MAX_MC_ADDR_LIST) {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL(
 				  "No free filter available; allow all multicast frames"
 				 ));
@@ -1776,7 +1776,7 @@ static void __hdd_set_multicast_list(struct net_device *dev)
 			       ETH_ALEN);
 			memcpy(&(adapter->mc_addr_list.addr[i][0]), ha->addr,
 			       ETH_ALEN);
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL("mlist[%d] = " MAC_ADDRESS_STR), i,
 			       MAC_ADDR_ARRAY(adapter->mc_addr_list.addr[i]));
 			i++;
@@ -1942,19 +1942,19 @@ QDF_STATUS hdd_register_interface(hdd_adapter_t *adapter,
 	if (rtnl_held) {
 		if (strnchr(pWlanDev->name, strlen(pWlanDev->name), '%')) {
 			if (dev_alloc_name(pWlanDev, pWlanDev->name) < 0) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("Failed:dev_alloc_name"));
 				return QDF_STATUS_E_FAILURE;
 			}
 		}
 		if (register_netdevice(pWlanDev)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("Failed:register_netdev"));
 			return QDF_STATUS_E_FAILURE;
 		}
 	} else {
 		if (register_netdev(pWlanDev)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("Failed:register_netdev"));
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -1969,12 +1969,12 @@ static QDF_STATUS hdd_sme_close_session_callback(void *pContext)
 	hdd_adapter_t *adapter = pContext;
 
 	if (NULL == adapter) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("NULL adapter"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("NULL adapter"));
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid magic"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid magic"));
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
@@ -2163,7 +2163,7 @@ void hdd_cleanup_actionframe(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
 			&adapter->tx_action_cnf_event,
 			msecs_to_jiffies(ACTION_FRAME_TX_TIMEOUT));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("HDD Wait for Action Confirmation Failed!!"));
 			/*
 			 * Inform tx status as FAILURE to upper layer and free
@@ -2299,7 +2299,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 		 * Max limit reached on the number of vdevs configured by the
 		 * host. Return error
 		 */
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "Unable to add virtual intf: currentVdevCnt=%d,hostConfiguredVdevCnt=%d"
 			 ),
@@ -2309,7 +2309,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 
 	if (macAddr == NULL) {
 		/* Not received valid macAddr */
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "Unable to add virtual intf: Not able to get valid mac address"
 			 ));
@@ -2317,7 +2317,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 	}
 	status = hdd_check_for_existing_macaddr(hdd_ctx, macAddr);
 	if (QDF_STATUS_E_FAILURE == status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "Duplicate MAC addr: " MAC_ADDRESS_STR
 		       " already exists",
 		       MAC_ADDR_ARRAY(macAddr));
@@ -2337,7 +2337,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 			hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name);
 
 		if (NULL == adapter) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("failed to allocate adapter for session %d"),
 			       session_type);
 			return NULL;
@@ -2409,7 +2409,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 			hdd_wlan_create_ap_dev(hdd_ctx, macAddr,
 					       (uint8_t *) iface_name);
 		if (NULL == adapter) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("failed to allocate adapter for session %d"),
 			       session_type);
 			return NULL;
@@ -2444,7 +2444,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 			hdd_alloc_station_adapter(hdd_ctx, macAddr, iface_name);
 
 		if (NULL == adapter) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("failed to allocate adapter for session %d"),
 			       session_type);
 			return NULL;
@@ -2469,10 +2469,10 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 	break;
 	default:
 	{
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Invalid session type %d"),
 		       session_type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 	}
@@ -2508,7 +2508,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 
 		/* Initialize the WoWL service */
 		if (!hdd_init_wowl(adapter)) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL("hdd_init_wowl failed"));
 			goto err_lro_cleanup;
 		}
@@ -2516,7 +2516,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 		/* Adapter successfully added. Increment the vdev count */
 		hdd_ctx->current_intf_count++;
 
-		hddLog(CDF_TRACE_LEVEL_DEBUG, FL("current_intf_count=%d"),
+		hddLog(QDF_TRACE_LEVEL_DEBUG, FL("current_intf_count=%d"),
 		       hdd_ctx->current_intf_count);
 
 		cds_check_and_restart_sap_with_non_dfs_acs();
@@ -2539,7 +2539,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 					  VDEV_CMD);
 
 		if (ret != 0) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("DTIM 1 chain set failed %d"), ret);
 			goto err_lro_cleanup;
 		}
@@ -2549,7 +2549,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 					  hdd_ctx->config->txchainmask1x1,
 					  PDEV_CMD);
 		if (ret != 0) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("WMI_PDEV_PARAM_TX_CHAIN_MASK set failed %d"),
 			       ret);
 			goto err_lro_cleanup;
@@ -2559,7 +2559,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 					  hdd_ctx->config->rxchainmask1x1,
 					  PDEV_CMD);
 		if (ret != 0) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("WMI_PDEV_PARAM_RX_CHAIN_MASK set failed %d"),
 			       ret);
 			goto err_lro_cleanup;
@@ -2575,7 +2575,7 @@ hdd_adapter_t *hdd_open_adapter(hdd_context_t *hdd_ctx, uint8_t session_type,
 					  PDEV_CMD);
 
 		if (ret != 0) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("WMI_PDEV_PARAM_HYST_EN set failed %d"),
 			       ret);
 			goto err_lro_cleanup;
@@ -2673,7 +2673,7 @@ QDF_STATUS hdd_close_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 
 	status = hdd_get_front_adapter(hdd_ctx, &pCurrent);
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"),
+		hddLog(QDF_TRACE_LEVEL_WARN, FL("adapter list empty %d"),
 		       status);
 		return status;
 	}
@@ -2821,7 +2821,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 					msecs_to_jiffies
 						(WLAN_WAIT_TIME_DISCONNECT));
 				if (!rc) {
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       FL(
 						  "wait on disconnect_comp_var failed"
 						 ));
@@ -2893,7 +2893,7 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 			 * is no sap restart work pending.
 			 */
 			cds_flush_work(&hdd_ctx->sap_start_work);
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 			       FL("Canceled the pending SAP restart work"));
 			cds_change_sap_restart_required_status(false);
 		}
@@ -3119,11 +3119,11 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx)
 
 		case WLAN_HDD_P2P_GO:
 #ifdef MSM_PLATFORM
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("[SSR] send stop ap to supplicant"));
 			cfg80211_ap_stopped(adapter->dev, GFP_KERNEL);
 #else
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("[SSR] send restart supplicant"));
 			/* event supplicant to restart */
 			cfg80211_del_sta(adapter->dev,
@@ -3259,7 +3259,7 @@ hdd_adapter_t *hdd_get_adapter_by_vdev(hdd_context_t *hdd_ctx,
 		adapterNode = pNext;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_ERROR,
+	hddLog(QDF_TRACE_LEVEL_ERROR,
 	       FL("vdev_id %d does not exist with host"), vdev_id);
 
 	return NULL;
@@ -3517,7 +3517,7 @@ static void hdd_disable_ftm(hdd_context_t *hdd_ctx)
 
 	if (hdd_ftm_stop(hdd_ctx)) {
 		hdd_alert("hdd_ftm_stop Failed!");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	hdd_ctx->ftm.ftm_state = WLAN_FTM_STOPPED;
@@ -3706,7 +3706,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx)
 
 	if (!QDF_IS_STATUS_SUCCESS
 		    (qdf_mc_timer_destroy(&hdd_ctx->bus_bw_timer))) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Cannot deallocate Bus bandwidth timer"));
 	}
 #endif
@@ -3719,7 +3719,7 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx)
 
 	if (!QDF_IS_STATUS_SUCCESS
 		    (qdf_mc_timer_destroy(&hdd_ctx->skip_acs_scan_timer))) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Cannot deallocate ACS Skip timer"));
 	}
 #endif
@@ -3756,9 +3756,9 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx)
 	/* Stop all the modules */
 	qdf_status = cds_disable(p_cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Failed to stop CDS"));
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 
 	/*
@@ -3768,9 +3768,9 @@ void hdd_wlan_exit(hdd_context_t *hdd_ctx)
 	 */
 	qdf_status = cds_sched_close(p_cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Failed to close CDS Scheduler"));
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 	}
 #ifdef WLAN_FEATURE_HOLD_RX_WAKELOCK
 	/* Destroy the wake lock */
@@ -3825,7 +3825,7 @@ void __hdd_wlan_exit(void)
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("Invalid HDD Context"));
 		EXIT();
 		return;
 	}
@@ -3951,7 +3951,7 @@ QDF_STATUS hdd_post_cds_enable_config(hdd_context_t *hdd_ctx)
 	 */
 	cdf_ret_status = sme_hdd_ready_ind(hdd_ctx->hHal);
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL(
 			  "sme_hdd_ready_ind() failed with status code %08d [x%08x]"
 			 ),
@@ -4013,7 +4013,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx)
 		vstatus = sme_get_wcnss_wlan_compiled_version(hdd_ctx->hHal,
 							      &versionCompiled);
 		if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL(
 				  "unable to retrieve WCNSS WLAN compiled version"
 				 ));
@@ -4023,7 +4023,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx)
 		vstatus = sme_get_wcnss_wlan_reported_version(hdd_ctx->hHal,
 							      &versionReported);
 		if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL(
 				  "unable to retrieve WCNSS WLAN reported version"
 				 ));
@@ -4058,7 +4058,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx)
 							 versionString,
 							 sizeof(versionString));
 		if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL(
 				  "unable to retrieve WCNSS software version string"
 				 ));
@@ -4072,7 +4072,7 @@ void hdd_exchange_version_and_caps(hdd_context_t *hdd_ctx)
 							 versionString,
 							 sizeof(versionString));
 		if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL(
 				  "unable to retrieve WCNSS hardware version string"
 				 ));
@@ -4153,7 +4153,7 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx)
 	 */
 	status = cds_regulatory_init();
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("cds_init_wiphy failed"));
 		return status;
 	}
@@ -4178,7 +4178,7 @@ static QDF_STATUS wlan_hdd_regulatory_init(hdd_context_t *hdd_ctx)
 
 	/* registration of wiphy dev with cfg80211 */
 	if (0 > wlan_hdd_cfg80211_register(wiphy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("wiphy register failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("wiphy register failed"));
 		status = QDF_STATUS_E_FAILURE;
 	}
 
@@ -4211,7 +4211,7 @@ void hdd_cnss_request_bus_bandwidth(hdd_context_t *hdd_ctx,
 							next_vote_level;
 
 	if (hdd_ctx->cur_vote_level != next_vote_level) {
-		hddLog(CDF_TRACE_LEVEL_DEBUG,
+		hddLog(QDF_TRACE_LEVEL_DEBUG,
 		       FL(
 			  "trigger level %d, tx_packets: %lld, rx_packets: %lld"
 			 ),
@@ -4233,7 +4233,7 @@ void hdd_cnss_request_bus_bandwidth(hdd_context_t *hdd_ctx,
 								next_rx_level;
 
 	if (hdd_ctx->cur_rx_level != next_rx_level) {
-		hddLog(CDF_TRACE_LEVEL_DEBUG,
+		hddLog(QDF_TRACE_LEVEL_DEBUG,
 		       FL("TCP DELACK trigger level %d, average_rx: %llu"),
 		       next_rx_level, temp_rx);
 		hdd_ctx->cur_rx_level = next_rx_level;
@@ -4329,7 +4329,7 @@ static void hdd_bus_bw_compute_cbk(void *priv)
 	rx_packets += (uint64_t)ipa_rx_packets;
 
 	if (!connected) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("bus bandwidth timer running in disconnected state"));
 		return;
 	}
@@ -4355,24 +4355,24 @@ void wlan_hdd_display_tx_rx_histogram(hdd_context_t *hdd_ctx)
 	int i;
 
 #ifdef MSM_PLATFORM
-	hddLog(CDF_TRACE_LEVEL_ERROR, "BW Interval: %d curr_index %d",
+	hddLog(QDF_TRACE_LEVEL_ERROR, "BW Interval: %d curr_index %d",
 		hdd_ctx->config->busBandwidthComputeInterval,
 		hdd_ctx->hdd_txrx_hist_idx);
-	hddLog(CDF_TRACE_LEVEL_ERROR,
+	hddLog(QDF_TRACE_LEVEL_ERROR,
 		"BW High TH: %d BW Med TH: %d BW Low TH: %d",
 		hdd_ctx->config->busBandwidthHighThreshold,
 		hdd_ctx->config->busBandwidthMediumThreshold,
 		hdd_ctx->config->busBandwidthLowThreshold);
-	hddLog(CDF_TRACE_LEVEL_ERROR, "TCP DEL High TH: %d TCP DEL Low TH: %d",
+	hddLog(QDF_TRACE_LEVEL_ERROR, "TCP DEL High TH: %d TCP DEL Low TH: %d",
 		hdd_ctx->config->tcpDelackThresholdHigh,
 		hdd_ctx->config->tcpDelackThresholdLow);
 #endif
 
-	hddLog(CDF_TRACE_LEVEL_ERROR,
+	hddLog(QDF_TRACE_LEVEL_ERROR,
 		"index, total_rx, interval_rx, total_tx, interval_tx, next_vote_level, next_rx_level, next_tx_level");
 
 	for (i = 0; i < NUM_TX_RX_HISTOGRAM; i++) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"%d: %llu, %llu, %llu, %llu, %d, %d, %d",
 			i, hdd_ctx->hdd_txrx_hist[i].total_rx,
 			hdd_ctx->hdd_txrx_hist[i].interval_rx,
@@ -4415,33 +4415,33 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx)
 	while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) {
 		adapter = adapter_node->pAdapter;
 
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"Session_id %d device mode %d current index %d",
 			adapter->sessionId, adapter->device_mode,
 			adapter->history_index);
 
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"Netif queue operation statistics:");
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"Current pause_map value %x", adapter->pause_map);
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"  reason_type: pause_cnt: unpause_cnt");
 
 		for (i = 0; i < WLAN_REASON_TYPE_MAX; i++) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 				"%s: %d: %d",
 				hdd_reason_type_to_string(i),
 				adapter->queue_oper_stats[i].pause_count,
 				adapter->queue_oper_stats[i].unpause_count);
 		}
 
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"Netif queue operation history:");
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			"index: time: action_type: reason_type: pause_map");
 
 		for (i = 0; i < WLAN_HDD_MAX_HISTORY_ENTRY; i++) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 				"%d: %u: %s: %s: %x",
 				i, qdf_system_ticks_to_msecs(
 					adapter->queue_oper_history[i].time),
@@ -4630,13 +4630,13 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt,
 		if (!is_unsafe) {
 			safe_channels[safe_channel_count] =
 			  CDS_CHANNEL_NUM(i);
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 			       FL("safe channel %d"),
 			       safe_channels[safe_channel_count]);
 			safe_channel_count++;
 		}
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       FL("perferred range %d - %d"),
 		ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch,
 		ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch);
@@ -4645,7 +4645,7 @@ static uint8_t hdd_find_prefd_safe_chnl(hdd_context_t *hdd_ctxt,
 			ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.start_ch
 		    && safe_channels[i] <=
 			ap_adapter->sessionCtx.ap.sapConfig.acs_cfg.end_ch) {
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 			       FL("safe channel %d is in perferred range"),
 			       safe_channels[i]);
 			return 1;
@@ -4735,7 +4735,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 
 	/* Basic sanity */
 	if (!hdd_context || !indi_param) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid arguments"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid arguments"));
 		return;
 	}
 
@@ -4744,7 +4744,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 	cds_context = hdd_ctxt->pcds_context;
 
 	/* Make unsafe channel list */
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       FL("band count %d"),
 	       ch_avoid_indi->avoid_range_count);
 
@@ -4829,7 +4829,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 		}
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       FL("number of unsafe channels is %d "),
 	       hdd_ctxt->unsafe_channel_count);
 
@@ -4847,7 +4847,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 
 	for (channel_loop = 0;
 	     channel_loop < hdd_ctxt->unsafe_channel_count; channel_loop++) {
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL("channel %d is not safe "),
 		       hdd_ctxt->unsafe_channel_list[channel_loop]);
 	}
@@ -4869,7 +4869,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 				hostapd_adapter)))
 				return;
 
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL(
 				  "Current operation channel %d, sessionCtx.ap.sapConfig.channel %d"
 				 ),
@@ -4888,7 +4888,7 @@ static void hdd_ch_avoid_cb(void *hdd_context, void *indi_param)
 						sapConfig.acs_cfg.acs_mode
 								 == true) &&
 					!restart_sap_in_progress) {
-					hddLog(CDF_TRACE_LEVEL_INFO,
+					hddLog(QDF_TRACE_LEVEL_INFO,
 					       FL("Restarting SAP"));
 					wlan_hdd_send_svc_nlink_msg
 						(WLAN_SVC_LTE_COEX_IND, NULL, 0);
@@ -4926,14 +4926,14 @@ static void hdd_init_channel_avoidance(hdd_context_t *hdd_ctx)
 				     &(hdd_ctx->unsafe_channel_count),
 				     sizeof(uint16_t) * NUM_20MHZ_RF_CHANNELS);
 
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("num of unsafe channels is %d"),
 	       hdd_ctx->unsafe_channel_count);
 
 	unsafe_channel_count = QDF_MIN((uint16_t)hdd_ctx->unsafe_channel_count,
 				       (uint16_t)NUM_20MHZ_RF_CHANNELS);
 
 	for (index = 0; index < unsafe_channel_count; index++) {
-		hddLog(CDF_TRACE_LEVEL_INFO, FL("channel %d is not safe"),
+		hddLog(QDF_TRACE_LEVEL_INFO, FL("channel %d is not safe"),
 		       hdd_ctx->unsafe_channel_list[index]);
 
 	}
@@ -5472,7 +5472,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 
 	status = cds_open();
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_open failed"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_open failed"));
 		goto err_hdd_free_context;
 	}
 
@@ -5481,13 +5481,13 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 	hdd_ctx->hHal = cds_get_context(QDF_MODULE_ID_SME);
 
 	if (NULL == hdd_ctx->hHal) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("HAL context is null"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("HAL context is null"));
 		goto err_cds_close;
 	}
 
 	status = cds_pre_enable(hdd_ctx->pcds_context);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_pre_enable failed"));
 		goto err_cds_close;
 	}
 
@@ -5496,7 +5496,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 	status = wlan_hdd_regulatory_init(hdd_ctx);
 
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Failed to init channel list"));
 		goto err_cds_close;
 	}
@@ -5518,7 +5518,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 	status = hdd_set_sme_config(hdd_ctx);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("Failed hdd_set_sme_config"));
 		goto err_wiphy_unregister;
 	}
 
@@ -5526,27 +5526,27 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 				  hdd_ctx->config->tx_chain_mask_1ss,
 				  PDEV_CMD);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: WMI_PDEV_PARAM_TX_CHAIN_MASK_1SS failed %d",
 		       __func__, ret);
 	}
 
 	status = hdd_set_sme_chan_list(hdd_ctx);
 	if (status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Failed to init channel list"));
 		goto err_wiphy_unregister;
 	}
 
 	/* Apply the cfg.ini to cfg.dat */
 	if (false == hdd_update_config_dat(hdd_ctx)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("config update failed"));
 		goto err_wiphy_unregister;
 	}
 
 	if (QDF_STATUS_SUCCESS != hdd_update_mac_config(hdd_ctx)) {
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       FL("can't update mac config, using MAC from ini file"));
 	}
 
@@ -5574,7 +5574,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 	 */
 	status = cds_enable(hdd_ctx->pcds_context);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("cds_enable failed"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("cds_enable failed"));
 		goto err_ipa_cleanup;
 	}
 
@@ -5582,7 +5582,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 
 	status = hdd_post_cds_enable_config(hdd_ctx);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("hdd_post_cds_enable_config failed"));
 		goto err_cds_disable;
 	}
@@ -5629,7 +5629,7 @@ int hdd_wlan_startup(struct device *dev, void *hif_sc)
 
 	/* Initialize the nlink service */
 	if (nl_srv_init() != 0) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("nl_srv_init failed"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("nl_srv_init failed"));
 		goto err_close_adapter;
 	}
 
@@ -5824,15 +5824,15 @@ err_wiphy_unregister:
 err_cds_close:
 	status = cds_sched_close(hdd_ctx->pcds_context);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       FL("Failed to close CDS Scheduler"));
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
 	}
 	cds_close(hdd_ctx->pcds_context);
 
 err_hdd_free_context:
 	hdd_free_context(hdd_ctx);
-	CDF_BUG(1);
+	QDF_BUG(1);
 
 	return -EIO;
 
@@ -6144,7 +6144,7 @@ void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len)
 	skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), flags);
 
 	if (skb == NULL) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("alloc_skb failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("alloc_skb failed"));
 		return;
 	}
 
@@ -6183,7 +6183,7 @@ void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len)
 		break;
 
 	default:
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("WLAN SVC: Attempt to send unknown nlink message %d"),
 		       type);
 		kfree_skb(skb);
@@ -6226,7 +6226,7 @@ void wlan_hdd_send_version_pkg(uint32_t fw_version,
 
 	ret = cnss_get_platform_cap(&cap);
 	if (ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("platform capability info from CNSS not available"));
 		return;
 	}
@@ -6256,7 +6256,7 @@ void wlan_hdd_send_all_scan_intf_info(hdd_context_t *hdd_ctx)
 	QDF_STATUS status;
 
 	if (!hdd_ctx) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("NULL pointer for hdd_ctx"));
 		return;
 	}
@@ -6440,7 +6440,7 @@ void hdd_stop_bus_bw_compute_timer(hdd_adapter_t *adapter)
 	if (QDF_TIMER_STATE_RUNNING !=
 	    qdf_mc_timer_get_current_state(&hdd_ctx->bus_bw_timer)) {
 		/* trying to stop timer, when not running is not good */
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("bus band width compute timer is not running"));
 		return;
 	}
@@ -6517,14 +6517,14 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
 			(channel_id < SIR_11A_CHANNEL_BEGIN)) {
 			if (hdd_ap_ctx->operatingChannel != channel_id) {
 				*concurrent_chnl_same = false;
-				hddLog(CDF_TRACE_LEVEL_INFO_MED,
+				hddLog(QDF_TRACE_LEVEL_INFO_MED,
 					FL("channels are different"));
 			}
 		} else if ((WLAN_HDD_P2P_GO == device_mode) &&
 				(channel_id >= SIR_11A_CHANNEL_BEGIN)) {
 			if (hdd_ap_ctx->operatingChannel != channel_id) {
 				*concurrent_chnl_same = false;
-				hddLog(CDF_TRACE_LEVEL_INFO_MED,
+				hddLog(QDF_TRACE_LEVEL_INFO_MED,
 					FL("channels are different"));
 			}
 		}
@@ -6536,7 +6536,7 @@ QDF_STATUS wlan_hdd_check_custom_con_channel_rules(hdd_adapter_t *sta_adapter,
 		 * Return the status as failure so caller function could know
 		 * that scan look up is failed.
 		 */
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Finding AP from scan cache failed"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6563,7 +6563,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 #endif
 
 	if (NULL == ap_adapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("ap_adapter is NULL here"));
 		return;
 	}
@@ -6571,7 +6571,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 	hdd_ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(ap_adapter);
 	hdd_ctx = WLAN_HDD_GET_CTX(ap_adapter);
 	if (0 != wlan_hdd_validate_context(hdd_ctx)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("HDD context is not valid"));
 		return;
 	}
@@ -6591,7 +6591,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 #endif
 		hdd_cleanup_actionframe(hdd_ctx, ap_adapter);
 		hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);
-		hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+		hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 		       FL("Now doing SAP STOPBSS"));
 		qdf_event_reset(&hostapd_state->cdf_stop_bss_event);
 		if (QDF_STATUS_SUCCESS == wlansap_stop_bss(hdd_ap_ctx->
@@ -6601,7 +6601,7 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 							   BSS_WAIT_TIMEOUT);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				mutex_unlock(&hdd_ctx->sap_lock);
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("SAP Stop Failed"));
 				return;
 			}
@@ -6609,10 +6609,10 @@ void wlan_hdd_stop_sap(hdd_adapter_t *ap_adapter)
 		clear_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 		cds_decr_session_set_pcl(ap_adapter->device_mode,
 						ap_adapter->sessionId);
-		hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+		hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 		       FL("SAP Stop Success"));
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Can't stop ap because its not started"));
 	}
 	mutex_unlock(&hdd_ctx->sap_lock);
@@ -6636,7 +6636,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
 	tsap_Config_t *sap_config;
 
 	if (NULL == ap_adapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("ap_adapter is NULL here"));
 		return;
 	}
@@ -6652,7 +6652,7 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
 	sap_config = &ap_adapter->sessionCtx.ap.sapConfig;
 
 	if (0 != wlan_hdd_validate_context(hdd_ctx)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("HDD context is not valid"));
 		return;
 	}
@@ -6672,15 +6672,15 @@ void wlan_hdd_start_sap(hdd_adapter_t *ap_adapter)
 			      != QDF_STATUS_SUCCESS)
 		goto end;
 
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 	       FL("Waiting for SAP to start"));
 	qdf_status = qdf_wait_single_event(&hostapd_state->cdf_event,
 					BSS_WAIT_TIMEOUT);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("SAP Start failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("SAP Start failed"));
 		goto end;
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Start Success"));
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("SAP Start Success"));
 	set_bit(SOFTAP_BSS_STARTED, &ap_adapter->event_flags);
 	cds_incr_active_session(ap_adapter->device_mode,
 					ap_adapter->sessionId);
diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c
index 29c857962a2e..f1907e2f8389 100644
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -60,7 +60,7 @@ struct qca_napi_data *hdd_napi_get_all(void)
 
 	hif = cds_get_context(QDF_MODULE_ID_HIF);
 	if (unlikely(NULL == hif))
-		CDF_ASSERT(NULL != hif); /* WARN */
+		QDF_ASSERT(NULL != hif); /* WARN */
 	else
 		rp = hif_napi_get_all(hif);
 
@@ -112,7 +112,7 @@ int hdd_napi_create(void)
 
 	hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 	if (unlikely(NULL == hif_ctx)) {
-		CDF_ASSERT(NULL != hif_ctx);
+		QDF_ASSERT(NULL != hif_ctx);
 		rc = -EFAULT;
 	} else {
 		/*
@@ -168,7 +168,7 @@ int hdd_napi_destroy(int force)
 
 		hif_ctx = cds_get_context(QDF_MODULE_ID_HIF);
 		if (unlikely(NULL == hif_ctx))
-			CDF_ASSERT(NULL != hif_ctx);
+			QDF_ASSERT(NULL != hif_ctx);
 		else
 			for (i = 0; i < CE_COUNT_MAX; i++)
 				if (hdd_napi_map & (0x01 << i)) {
@@ -189,7 +189,7 @@ int hdd_napi_destroy(int force)
 	 * to be removed
 	 */
 	if (force)
-		CDF_ASSERT(hdd_napi_map == 0);
+		QDF_ASSERT(hdd_napi_map == 0);
 	if (0 == hdd_napi_map)
 		hdd_napi_ctx = NULL;
 
@@ -212,7 +212,7 @@ int hdd_napi_enabled(int id)
 
 	hif = cds_get_context(QDF_MODULE_ID_HIF);
 	if (unlikely(NULL == hif))
-		CDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */
+		QDF_ASSERT(hif != NULL); /* WARN_ON; rc = 0 */
 	else if (-1 == id)
 		rc = hif_napi_enabled(hif, id);
 	else
@@ -245,7 +245,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data)
 
 	hif = cds_get_context(QDF_MODULE_ID_HIF);
 	if (unlikely(NULL == hif))
-		CDF_ASSERT(hif != NULL);
+		QDF_ASSERT(hif != NULL);
 	else
 		rc = hif_napi_event(hif, event, data);
 
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index f2247e247b7f..d310bb391cea 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -183,14 +183,14 @@ static void send_oem_reg_rsp_nlink_msg(void)
 
 	/* OEM message is always to a specific process and cannot be a broadcast */
 	if (p_hdd_ctx->oem_pid == 0) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid dest pid", __func__);
 		return;
 	}
 
 	skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
 	if (skb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: alloc_skb failed", __func__);
 		return;
 	}
@@ -223,7 +223,7 @@ static void send_oem_reg_rsp_nlink_msg(void)
 			*deviceMode = pAdapter->device_mode;
 			*vdevId = pAdapter->sessionId;
 			(*numInterfaces)++;
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: numInterfaces: %d, deviceMode: %d, vdevId: %d",
 				  __func__, *numInterfaces, *deviceMode,
 				  *vdevId);
@@ -238,7 +238,7 @@ static void send_oem_reg_rsp_nlink_msg(void)
 
 	skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: sending App Reg Response length (%d) to process pid (%d)",
 		  __func__, aniHdr->length, p_hdd_ctx->oem_pid);
 
@@ -265,7 +265,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code)
 
 	skb = alloc_skb(NLMSG_SPACE(WLAN_NL_MAX_PAYLOAD), GFP_KERNEL);
 	if (skb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: alloc_skb failed", __func__);
 		return;
 	}
@@ -286,7 +286,7 @@ static void send_oem_err_rsp_nlink_msg(int32_t app_pid, uint8_t error_code)
 
 	skb_put(skb, NLMSG_SPACE(sizeof(tAniMsgHdr) + aniHdr->length));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: sending oem error response to process pid (%d)",
 		  __func__, app_pid);
 
@@ -314,13 +314,13 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp)
 
 	/* OEM message is always to a specific process and cannot be a broadcast */
 	if (p_hdd_ctx->oem_pid == 0) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid dest pid", __func__);
 		return;
 	}
 
 	if (length > OEM_DATA_RSP_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid length of Oem Data response", __func__);
 		return;
 	}
@@ -328,7 +328,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp)
 	skb = alloc_skb(NLMSG_SPACE(sizeof(tAniMsgHdr) + OEM_DATA_RSP_SIZE),
 			GFP_KERNEL);
 	if (skb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: alloc_skb failed", __func__);
 		return;
 	}
@@ -348,7 +348,7 @@ void hdd_send_oem_data_rsp_msg(int length, uint8_t *oemDataRsp)
 
 	skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: sending Oem Data Response of len (%d) to process pid (%d)",
 		  __func__, length, p_hdd_ctx->oem_pid);
 
@@ -376,13 +376,13 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData)
 	/* for now, STA interface only */
 	pAdapter = hdd_get_adapter(p_hdd_ctx, WLAN_HDD_INFRA_STATION);
 	if (!pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: No adapter for STA mode", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (!oemData) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: oemData is null", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -398,7 +398,7 @@ static QDF_STATUS oem_process_data_req_msg(int oemDataLen, char *oemData)
 	oemDataReqConfig.data_len = oemDataLen;
 	cdf_mem_copy(oemDataReqConfig.data, oemData, oemDataLen);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: calling sme_oem_data_req", __func__);
 
 	status = sme_oem_data_req(p_hdd_ctx->hHal,
@@ -437,7 +437,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 
 	/* OEM message is always to a specific process and cannot be a broadcast */
 	if (p_hdd_ctx->oem_pid == 0) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid dest pid", __func__);
 		return -EPERM;
 	}
@@ -446,7 +446,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 				    numOfChannels * sizeof(tHddChannelInfo)),
 			GFP_KERNEL);
 	if (skb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: alloc_skb failed", __func__);
 		return -ENOMEM;
 	}
@@ -498,7 +498,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 			/* channel info is not returned, fill in zeros in channel
 			 * info struct
 			 */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: sme_get_reg_info failed for chan (%d), return info 0",
 				  __func__, chanId);
 			hddChanInfo.chan_id = chanId;
@@ -516,7 +516,7 @@ static int oem_process_channel_info_req_msg(int numOfChannels, char *chanList)
 
 	skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: sending channel info resp for num channels (%d) to pid (%d)",
 		  __func__, numOfChannels, p_hdd_ctx->oem_pid);
 
@@ -674,7 +674,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 	tPeerStatusInfo *pPeerInfo;
 
 	if (!p_hdd_ctx || !p_hdd_ctx->hHal) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Either HDD Ctx is null or Hal Ctx is null",
 			  __func__);
 		return;
@@ -682,7 +682,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 
 	/* check if oem app has registered and pid is valid */
 	if ((!p_hdd_ctx->oem_app_registered) || (p_hdd_ctx->oem_pid == 0)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: OEM app is not registered(%d) or pid is invalid(%d)",
 			  __func__, p_hdd_ctx->oem_app_registered,
 			  p_hdd_ctx->oem_pid);
@@ -693,7 +693,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 				    sizeof(tPeerStatusInfo)),
 			GFP_KERNEL);
 	if (skb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: alloc_skb failed", __func__);
 		return;
 	}
@@ -741,7 +741,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 	}
 	skb_put(skb, NLMSG_SPACE((sizeof(tAniMsgHdr) + aniHdr->length)));
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: sending peer " MAC_ADDRESS_STR
 		  " status(%d), peerTimingMeasCap(%d), vdevId(%d), chanId(%d)"
 		  " to oem app pid(%d), center freq 1 (%d), center freq 2 (%d),"
@@ -787,14 +787,14 @@ static int oem_msg_callback(struct sk_buff *skb)
 	nlh = (struct nlmsghdr *)skb->data;
 
 	if (!nlh) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Netlink header null", __func__);
 		return -EPERM;
 	}
 
 	ret = wlan_hdd_validate_context(p_hdd_ctx);
 	if (0 != ret) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("HDD context is not valid"));
 		return ret;
 	}
@@ -802,7 +802,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 	msg_hdr = NLMSG_DATA(nlh);
 
 	if (!msg_hdr) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Message header null", __func__);
 		send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
 					   OEM_ERR_NULL_MESSAGE_HEADER);
@@ -811,7 +811,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 
 	if (nlh->nlmsg_len <
 	    NLMSG_LENGTH(sizeof(tAniMsgHdr) + msg_hdr->length)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid nl msg len, nlh->nlmsg_len (%d), msg_hdr->len (%d)",
 			  __func__, nlh->nlmsg_len, msg_hdr->length);
 		send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -822,7 +822,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 	switch (msg_hdr->type) {
 	case ANI_MSG_APP_REG_REQ:
 		/* Registration request is only allowed for Qualcomm Application */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Received App Req Req from App process pid(%d), len(%d)",
 			  __func__, nlh->nlmsg_pid, msg_hdr->length);
 
@@ -830,7 +830,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 		if ((OEM_APP_SIGNATURE_LEN == msg_hdr->length) &&
 		    (0 == strncmp(sign_str, OEM_APP_SIGNATURE_STR,
 				  OEM_APP_SIGNATURE_LEN))) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: Valid App Req Req from oem app process pid(%d)",
 				  __func__, nlh->nlmsg_pid);
 
@@ -838,7 +838,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 			p_hdd_ctx->oem_pid = nlh->nlmsg_pid;
 			send_oem_reg_rsp_nlink_msg();
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Invalid signature in App Reg Request from pid(%d)",
 				  __func__, nlh->nlmsg_pid);
 			send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -848,14 +848,14 @@ static int oem_msg_callback(struct sk_buff *skb)
 		break;
 
 	case ANI_MSG_OEM_DATA_REQ:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Received Oem Data Request length(%d) from pid: %d",
 			  __func__, msg_hdr->length, nlh->nlmsg_pid);
 
 		if ((!p_hdd_ctx->oem_app_registered) ||
 		    (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) {
 			/* either oem app is not registered yet or pid is different */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: OEM DataReq: app not registered(%d) or incorrect pid(%d)",
 				  __func__, p_hdd_ctx->oem_app_registered,
 				  nlh->nlmsg_pid);
@@ -865,7 +865,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 		}
 
 		if ((!msg_hdr->length) || (OEM_DATA_REQ_SIZE < msg_hdr->length)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Invalid length (%d) in Oem Data Request",
 				  __func__, msg_hdr->length);
 			send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -878,14 +878,14 @@ static int oem_msg_callback(struct sk_buff *skb)
 		break;
 
 	case ANI_MSG_CHANNEL_INFO_REQ:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Received channel info request, num channel(%d) from pid: %d",
 			  __func__, msg_hdr->length, nlh->nlmsg_pid);
 
 		if ((!p_hdd_ctx->oem_app_registered) ||
 		    (nlh->nlmsg_pid != p_hdd_ctx->oem_pid)) {
 			/* either oem app is not registered yet or pid is different */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Chan InfoReq: app not registered(%d) or incorrect pid(%d)",
 				  __func__, p_hdd_ctx->oem_app_registered,
 				  nlh->nlmsg_pid);
@@ -897,7 +897,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 		/* message length contains list of channel ids */
 		if ((!msg_hdr->length) ||
 		    (WNI_CFG_VALID_CHANNEL_LIST_LEN < msg_hdr->length)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Invalid length (%d) in channel info request",
 				  __func__, msg_hdr->length);
 			send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
@@ -958,7 +958,7 @@ static int oem_msg_callback(struct sk_buff *skb)
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Received Invalid message type (%d), length (%d)",
 			  __func__, msg_hdr->type, msg_hdr->length);
 		send_oem_err_rsp_nlink_msg(nlh->nlmsg_pid,
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index 6751a5170f70..391bcde2a2b0 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -41,7 +41,7 @@
 #include "wlan_hdd_p2p.h"
 #include "sap_api.h"
 #include "wlan_hdd_main.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
 #include <linux/etherdevice.h>
@@ -49,7 +49,7 @@
 #include "wlan_hdd_tdls.h"
 #include "wlan_hdd_trace.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_sched.h"
 #include "cds_concurrency.h"
 
@@ -400,7 +400,7 @@ void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter)
 	unsigned long rc;
 	hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			"%s: ROC completion is not received.!!!",
 			__func__);
 
@@ -438,8 +438,8 @@ wait:
 			msecs_to_jiffies
 			(WAIT_CANCEL_REM_CHAN));
 	if (!rc) {
-		CDF_TRACE(QDF_MODULE_ID_HDD,
-		    CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD,
+		    QDF_TRACE_LEVEL_ERROR,
 		    "%s: Timeout occurred while waiting for RoC Cancellation",
 		    __func__);
 		mutex_lock(&cfg_state->remain_on_chan_ctx_lock);
@@ -472,7 +472,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(hdd_adapter_t *pAdapter)
 	mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 	while (pAdapter->is_roc_inprogress) {
 		mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: ROC in progress for session %d!!!",
 			  __func__, pAdapter->sessionId);
 		msleep(500);
@@ -554,7 +554,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 	mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 	if (pAdapter->is_roc_inprogress == true) {
 		mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			FL("remain on channel request is in execution"));
 		return -EBUSY;
 	}
@@ -570,7 +570,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 				  QDF_TIMER_TYPE_SW,
 				  wlan_hdd_remain_on_chan_timeout, pAdapter);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Not able to initialize remain_on_chan timer"));
 		mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 		cfgState->remain_on_chan_ctx = NULL;
@@ -673,7 +673,7 @@ static int wlan_hdd_execute_remain_on_channel(hdd_adapter_t *pAdapter,
 #endif
 			(SIR_MAC_MGMT_FRAME << 2) |
 			(SIR_MAC_MGMT_PROBE_REQ << 4), NULL, 0)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				FL("wlansap_register_mgmt_frame return fail"));
 			wlansap_cancel_remain_on_channel(
 #ifdef WLAN_FEATURE_MBSSID
@@ -807,7 +807,7 @@ void wlan_hdd_roc_request_dequeue(struct work_struct *work)
 			hdd_roc_req->pAdapter,
 			hdd_roc_req->pRemainChanCtx);
 	if (ret == -EBUSY) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 				FL("dropping RoC request"));
 		wlan_hdd_indicate_roc_drop(hdd_roc_req->pAdapter,
 					   hdd_roc_req->pRemainChanCtx);
@@ -851,7 +851,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy,
 	}
 	pRemainChanCtx = cdf_mem_malloc(sizeof(hdd_remain_on_chan_ctx_t));
 	if (NULL == pRemainChanCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: Not able to allocate memory for Channel context",
 		       __func__);
 		return -ENOMEM;
@@ -954,7 +954,7 @@ int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_REMAIN_ON_CHANNEL,
 			 pAdapter->sessionId, REMAIN_ON_CHANNEL_REQUEST));
 
@@ -1000,7 +1000,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter,
 	mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 	pRemainChanCtx = cfgState->remain_on_chan_ctx;
 	if (pRemainChanCtx != NULL) {
-		MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+		MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 				 TRACE_CODE_HDD_REMAINCHANREADYHANDLER,
 				 pAdapter->sessionId,
 				 pRemainChanCtx->duration));
@@ -1260,7 +1260,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_ACTION, pAdapter->sessionId,
 			 pAdapter->device_mode));
 	status = wlan_hdd_validate_context(pHddCtx);
@@ -1279,13 +1279,13 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 				[WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET])) {
 		actionFrmType = buf[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET];
 		if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "[P2P] unknown[%d] ---> OTA to " MAC_ADDRESS_STR,
 			       actionFrmType,
 			       MAC_ADDR_ARRAY(&buf
 					      [WLAN_HDD_80211_FRM_DA_OFFSET]));
 		} else {
-			hddLog(CDF_TRACE_LEVEL_ERROR, "[P2P] %s ---> OTA to "
+			hddLog(QDF_TRACE_LEVEL_ERROR, "[P2P] %s ---> OTA to "
 			       MAC_ADDRESS_STR,
 			       p2p_action_frame_type[actionFrmType],
 			       MAC_ADDR_ARRAY(&buf
@@ -1362,7 +1362,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 				memcpy(&dstMac,
 				       &buf[WLAN_HDD_80211_FRM_DA_OFFSET],
 				       ETH_ALEN);
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "%s: Deauth/Disassoc received for STA:"
 				       MAC_ADDRESS_STR, __func__,
 				       MAC_ADDR_ARRAY(dstMac));
@@ -1444,7 +1444,7 @@ int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 				    true) {
 					mutex_unlock(&cfgState->
 						     remain_on_chan_ctx_lock);
-					hddLog(CDF_TRACE_LEVEL_INFO,
+					hddLog(QDF_TRACE_LEVEL_INFO,
 					       "action frame tx: waiting for completion of ROC ");
 
 					rc = wait_for_completion_timeout
@@ -1576,7 +1576,7 @@ send_frame:
 		    sme_send_action(WLAN_HDD_GET_HAL_CTX(pAdapter),
 				    sessionId, buf, len, extendedWait, noack,
 				    current_freq)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: sme_send_action returned fail", __func__);
 			goto err;
 		}
@@ -1723,19 +1723,19 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command)
 
 	param = strnchr(command, strlen(command), ' ');
 	if (param == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: strnchr failed to find delimeter", __func__);
 		return -EINVAL;
 	}
 	param++;
 	ret = sscanf(param, "%d %d %d", &count, &start_time, &duration);
 	if (ret != 3) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: P2P_SET GO NoA: fail to read params, ret=%d",
 			  __func__, ret);
 		return -EINVAL;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: P2P_SET GO NoA: count=%d start_time=%d duration=%d",
 		  __func__, count, start_time, duration);
 	duration = MS_TO_MUS(duration);
@@ -1758,7 +1758,7 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command)
 	NoA.count = count;
 	NoA.sessionid = pAdapter->sessionId;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
 		  "interval %d count %d single noa duration %d "
 		  "PsSelection %x", __func__, NoA.opp_ps,
@@ -1801,19 +1801,19 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 
 	param = strnchr(command, strlen(command), ' ');
 	if (param == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: strnchr failed to find delimiter", __func__);
 		return -EINVAL;
 	}
 	param++;
 	ret = sscanf(param, "%d %d %d", &legacy_ps, &opp_ps, &ctwindow);
 	if (ret != 3) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: P2P_SET GO PS: fail to read params, ret=%d",
 			  __func__, ret);
 		return -EINVAL;
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: P2P_SET GO PS: legacy_ps=%d opp_ps=%d ctwindow=%d",
 		  __func__, legacy_ps, opp_ps, ctwindow);
 
@@ -1831,7 +1831,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 	 */
 	if (ctwindow != -1) {
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "Opportunistic Power Save is %s",
 			  (true == pAdapter->ops) ? "Enable" : "Disable");
 
@@ -1849,8 +1849,8 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 					P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
 				NoA.sessionid = pAdapter->sessionId;
 
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
 					  "interval %d count %d single noa duration %d "
 					  "PsSelection %x", __func__,
@@ -1878,7 +1878,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 			NoA.psSelection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
 			NoA.sessionid = pAdapter->sessionId;
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
 				  "interval %d count %d single noa duration %d "
 				  "PsSelection %x", __func__, NoA.opp_ps,
@@ -1961,7 +1961,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	if (0 != ret)
 		return ERR_PTR(ret);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_ADD_VIRTUAL_INTF, NO_SESSION, type));
 	/*
 	 * Allow addition multiple interfaces for WLAN_HDD_P2P_GO,
@@ -2018,7 +2018,7 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
 	}
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: hdd_open_adapter failed",
 		       __func__);
 		return ERR_PTR(-ENOSPC);
 	}
@@ -2053,7 +2053,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_DEL_VIRTUAL_INTF,
 			 pVirtAdapter->sessionId, pVirtAdapter->device_mode));
 	hddLog(LOG1, FL("Device_mode %s(%d)"),
@@ -2100,7 +2100,7 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter,
 	hdd_remain_on_chan_ctx_t *pRemainChanCtx = NULL;
 	hdd_context_t *pHddCtx;
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d",
+	hddLog(QDF_TRACE_LEVEL_INFO, "%s: Frame Type = %d Frame Length = %d",
 	       __func__, frameType, nFrameLength);
 
 	if (NULL == pAdapter) {
@@ -2187,13 +2187,13 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter,
 				       actionFrmType);
 #ifdef WLAN_FEATURE_P2P_DEBUG
 				if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) {
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       "[P2P] unknown[%d] <--- OTA"
 					       " from " MAC_ADDRESS_STR,
 					       actionFrmType,
 					       MAC_ADDR_ARRAY(macFrom));
 				} else {
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       "[P2P] %s <--- OTA" " from "
 					       MAC_ADDRESS_STR,
 					       p2p_action_frame_type
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 73ed40953d24..b26c9e8e36c7 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -120,14 +120,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable)
 						  &hddGtkOffloadReqParams,
 						  pAdapter->sessionId);
 			if (QDF_STATUS_SUCCESS != ret) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: sme_set_gtk_offload failed, returned %d",
 					  __func__, ret);
 				return;
 			}
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "%s: sme_set_gtk_offload successfull",
 				  __func__);
 		}
@@ -146,14 +146,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable)
 				 wlan_hdd_cfg80211_update_replay_counter_callback,
 				 pAdapter, pAdapter->sessionId);
 			if (QDF_STATUS_SUCCESS != ret) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: sme_get_gtk_offload failed, returned %d",
 					  __func__, ret);
 				return;
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: sme_get_gtk_offload successful",
 					  __func__);
 
@@ -169,14 +169,14 @@ static void hdd_conf_gtk_offload(hdd_adapter_t *pAdapter, bool fenable)
 							    &hddGtkOffloadReqParams,
 							    pAdapter->sessionId);
 				if (QDF_STATUS_SUCCESS != ret) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: failed to dissable GTK offload, returned %d",
 						  __func__, ret);
 					return;
 				}
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: successfully dissabled GTK offload request to HAL",
 					  __func__);
 			}
@@ -719,7 +719,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 			offLoadRequest.offloadType = SIR_IPV4_ARP_REPLY_OFFLOAD;
 			offLoadRequest.enableOrDisable = SIR_OFFLOAD_ENABLE;
 
-			hddLog(CDF_TRACE_LEVEL_INFO, "%s: Enabled", __func__);
+			hddLog(QDF_TRACE_LEVEL_INFO, "%s: Enabled", __func__);
 
 			if (((HDD_MCASTBCASTFILTER_FILTER_ALL_BROADCAST ==
 			      pHddCtx->sus_res_mcastbcast_filter) ||
@@ -729,11 +729,11 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 				pHddCtx->sus_res_mcastbcast_filter_valid)) {
 				offLoadRequest.enableOrDisable =
 					SIR_OFFLOAD_ARP_AND_BCAST_FILTER_ENABLE;
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "offload: inside arp offload conditional check");
 			}
 
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       "offload: arp filter programmed = %d",
 			       offLoadRequest.enableOrDisable);
 
@@ -742,7 +742,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 				offLoadRequest.params.hostIpv4Addr[i] =
 					(ifa->ifa_local >> (i * 8)) & 0xFF;
 			}
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       " Enable SME HostOffload: %d.%d.%d.%d",
 			       offLoadRequest.params.hostIpv4Addr[0],
 			       offLoadRequest.params.hostIpv4Addr[1],
@@ -753,13 +753,13 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 			    sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter),
 						 pAdapter->sessionId,
 						 &offLoadRequest)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       "%s: Failed to enable HostOffload feature",
 				       __func__);
 				return QDF_STATUS_E_FAILURE;
 			}
 		} else {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       FL("IP Address is not assigned"));
 		}
 
@@ -773,7 +773,7 @@ QDF_STATUS hdd_conf_arp_offload(hdd_adapter_t *pAdapter, bool fenable)
 		if (QDF_STATUS_SUCCESS !=
 		    sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter),
 					 pAdapter->sessionId, &offLoadRequest)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Failure to disable host " "offload feature",
 			       __func__);
 			return QDF_STATUS_E_FAILURE;
@@ -796,7 +796,7 @@ static void hdd_mcbc_filter_modification(hdd_context_t *pHddCtx,
 					 uint8_t *pMcBcFilter)
 {
 	if (NULL == pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("NULL HDD context passed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("NULL HDD context passed"));
 		return;
 	}
 
@@ -836,11 +836,11 @@ void hdd_conf_mcastbcast_filter(hdd_context_t *pHddCtx, bool setfilter)
 	tpSirWlanSetRxpFilters wlanRxpFilterParam =
 		cdf_mem_malloc(sizeof(tSirWlanSetRxpFilters));
 	if (NULL == wlanRxpFilterParam) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: cdf_mem_alloc failed ", __func__);
 		return;
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "%s: Configuring Mcast/Bcast Filter Setting. setfilter %d",
 	       __func__, setfilter);
 	if (true == setfilter) {
@@ -885,27 +885,27 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set)
 	hdd_context_t *pHddCtx = (hdd_context_t *) pAdapter->pHddCtx;
 
 	if (NULL == pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD CTX is NULL"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD CTX is NULL"));
 		return;
 	}
 
 	hHal = pHddCtx->hHal;
 
 	if (NULL == hHal) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HAL Handle is NULL"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HAL Handle is NULL"));
 		return;
 	}
 
 	/* Check if INI is enabled or not, other wise just return
 	 */
 	if (!pHddCtx->config->fEnableMCAddrList) {
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       FL("gMCAddrListEnable is not enabled in INI"));
 		return;
 	}
 	pMulticastAddrs = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList));
 	if (NULL == pMulticastAddrs) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Could not allocate Memory"));
 		return;
 	}
@@ -958,7 +958,7 @@ void wlan_hdd_set_mc_addr_list(hdd_adapter_t *pAdapter, uint8_t set)
 
 	}
 	/* MAddrCnt is MulticastAddrCnt */
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "smeSessionId:%d; set:%d; MCAdddrCnt :%d",
 	       pAdapter->sessionId, set,
 	       pMulticastAddrs->ulMulticastAddrCnt);
@@ -1012,7 +1012,7 @@ static void hdd_send_suspend_ind(hdd_context_t *pHddCtx,
 	if (QDF_STATUS_SUCCESS == cdf_ret_status) {
 		pHddCtx->hdd_mcastbcast_filter_set = true;
 	} else {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("sme_configure_suspend_ind returned failure %d"),
 		       cdf_ret_status);
 	}
@@ -1032,13 +1032,13 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter)
 	cdf_ret_status = sme_configure_resume_req(pHddCtx->hHal, NULL);
 
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: sme_configure_resume_req return failure %d",
 		       __func__, cdf_ret_status);
 
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "%s: send wlan resume indication", __func__);
 	/* Disable supported OffLoads */
 	hdd_conf_hostoffload(pAdapter, false);
@@ -1050,9 +1050,9 @@ static void hdd_conf_resume_ind(hdd_adapter_t *pAdapter)
 		pHddCtx->sus_res_mcastbcast_filter_valid = false;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "offload: in hdd_conf_resume_ind, restoring configuredMcastBcastFilter");
-	hddLog(CDF_TRACE_LEVEL_INFO, "configuredMcastBcastFilter = %d",
+	hddLog(QDF_TRACE_LEVEL_INFO, "configuredMcastBcastFilter = %d",
 	       pHddCtx->configuredMcastBcastFilter);
 }
 
@@ -1099,7 +1099,7 @@ hdd_suspend_wlan(void (*callback)(void *callbackContext, bool suspended),
 
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
 		       __func__);
 		return;
 	}
@@ -1151,12 +1151,12 @@ static void hdd_resume_wlan(void)
 	hdd_adapter_list_node_t *pAdapterNode = NULL, *pNext = NULL;
 	QDF_STATUS status;
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS",
+	hddLog(QDF_TRACE_LEVEL_INFO, "%s: WLAN being resumed by OS",
 	       __func__);
 
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
 		       __func__);
 		return;
 	}
@@ -1197,7 +1197,7 @@ static void hdd_resume_wlan(void)
  * When SSR is initiated, an SSR timer is started.  Under normal
  * circumstances SSR should complete amd the timer should be deleted
  * before it fires.  If the SSR timer does fire, it indicates SSR has
- * taken too long, and our only recourse is to invoke the CDF_BUG()
+ * taken too long, and our only recourse is to invoke the QDF_BUG()
  * API which can allow a crashdump to be captured.
  */
 
@@ -1230,8 +1230,8 @@ static void hdd_ssr_timer_del(void)
  */
 static void hdd_ssr_timer_cb(unsigned long data)
 {
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD SSR timer expired!", __func__);
-	CDF_BUG(0);
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD SSR timer expired!", __func__);
+	QDF_BUG(0);
 }
 
 /**
@@ -1243,7 +1243,7 @@ static void hdd_ssr_timer_cb(unsigned long data)
 static void hdd_ssr_timer_start(int msec)
 {
 	if (ssr_timer_started) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: Trying to start SSR timer when " "it's running!",
 		       __func__);
 	}
@@ -1268,7 +1268,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	hdd_context_t *pHddCtx;
 	p_cds_sched_context cds_sched_context = NULL;
 
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutting down!",
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutting down!",
 	       __func__);
 
 #ifdef WLAN_FEATURE_LPSS
@@ -1282,7 +1282,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	/* Get the global CDS context. */
 	p_cds_context = cds_get_global_context();
 	if (!p_cds_context) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Global CDS context is Null",
 		       __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1290,7 +1290,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	/* Get the HDD context. */
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
 		       __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1322,7 +1322,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	 * gracefully.
 	 */
 	/* Wait for MC to exit */
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Shutting down MC thread", __func__);
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Shutting down MC thread", __func__);
 	set_bit(MC_SHUTDOWN_EVENT_MASK, &cds_sched_context->mcEventFlag);
 	set_bit(MC_POST_EVENT_MASK, &cds_sched_context->mcEventFlag);
 	wake_up_interruptible(&cds_sched_context->mcWaitQueue);
@@ -1330,7 +1330,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 
 #ifdef QCA_CONFIG_SMP
 	/* Wait for OL RX to exit */
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Shutting down OL RX thread",
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Shutting down OL RX thread",
 	       __func__);
 	unregister_hotcpu_notifier(cds_sched_context->cpu_hot_plug_notifier);
 	set_bit(RX_SHUTDOWN_EVENT_MASK, &cds_sched_context->ol_rx_event_flag);
@@ -1342,44 +1342,44 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	cds_free_ol_rx_pkt_freeq(cds_sched_context);
 #endif
 
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__);
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing WMA STOP", __func__);
 	qdf_status = wma_stop(p_cds_context, HAL_STOP_TYPE_RF_KILL);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop WMA", __func__);
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 		wma_setneedshutdown(p_cds_context);
 	}
 
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing SME STOP", __func__);
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing SME STOP", __func__);
 	/* Stop SME - Cannot invoke cds_disable as cds_disable relies
 	 * on threads being running to process the SYS Stop
 	 */
 	qdf_status = sme_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop sme %d", __func__, qdf_status);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__);
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: Doing MAC STOP", __func__);
 	/* Stop MAC (PE and HAL) */
 	qdf_status = mac_stop(pHddCtx->hHal, HAL_STOP_TYPE_SYS_RESET);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to stop mac %d", __func__, qdf_status);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "%s: Flush Queues", __func__);
+	hddLog(QDF_TRACE_LEVEL_INFO, "%s: Flush Queues", __func__);
 	/* Clean up message queues of TX, RX and MC thread */
 	cds_sched_flush_mc_mqs(cds_sched_context);
 
 	/* Deinit all the TX, RX and MC queues */
 	cds_sched_deinit_mqs(cds_sched_context);
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "%s: Doing CDS Shutdown", __func__);
+	hddLog(QDF_TRACE_LEVEL_INFO, "%s: Doing CDS Shutdown", __func__);
 	/* shutdown CDS */
 	cds_shutdown(p_cds_context);
 
@@ -1387,7 +1387,7 @@ QDF_STATUS hdd_wlan_shutdown(void)
 	   so setting it to NULL in hdd context */
 	pHddCtx->hHal = (tHalHandle) NULL;
 
-	hddLog(CDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete",
+	hddLog(QDF_TRACE_LEVEL_FATAL, "%s: WLAN driver shutdown complete",
 	       __func__);
 	return QDF_STATUS_SUCCESS;
 }
@@ -1414,7 +1414,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	/* Get the CDS context */
 	p_cds_context = cds_get_global_context();
 	if (p_cds_context == NULL) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: Failed cds_get_global_context", __func__);
 		goto err_re_init;
 	}
@@ -1422,13 +1422,13 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	/* Get the HDD context */
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!pHddCtx) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HDD context is Null",
 		       __func__);
 		goto err_re_init;
 	}
 
 	if (!hif_sc) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: hif_sc is NULL", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: hif_sc is NULL", __func__);
 		goto err_re_init;
 	}
 
@@ -1440,14 +1440,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	/* Re-open CDS, it is a re-open b'se control transport was never closed. */
 	qdf_status = cds_open();
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_open failed", __func__);
 		goto err_re_init;
 	}
 
 	/* Save the hal context in Adapter */
 	pHddCtx->hHal = cds_get_context(QDF_MODULE_ID_SME);
 	if (NULL == pHddCtx->hHal) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: HAL context is null",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: HAL context is null",
 		       __func__);
 		goto err_cds_close;
 	}
@@ -1474,14 +1474,14 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 
 	qdf_status = hdd_set_sme_chan_list(pHddCtx);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: Failed to init channel list", __func__);
 		goto err_cds_close;
 	}
 
 	/* Apply the cfg.ini to cfg.dat */
 	if (false == hdd_update_config_dat(pHddCtx)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: config update failed",
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: config update failed",
 		       __func__);
 		goto err_cds_close;
 	}
@@ -1493,7 +1493,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 				     intfMacAddr[0],
 				     sizeof(pHddCtx->config->intfMacAddr[0]));
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. "
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Failed to set MAC Address. "
 		       "HALStatus is %08d [x%08x]", __func__, cdf_ret_status,
 		       cdf_ret_status);
 		goto err_cds_close;
@@ -1503,13 +1503,13 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 	   Note: Firmware image will be read and downloaded inside cds_enable API */
 	qdf_status = cds_enable(p_cds_context);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__);
+		hddLog(QDF_TRACE_LEVEL_FATAL, "%s: cds_enable failed", __func__);
 		goto err_cds_close;
 	}
 
 	qdf_status = hdd_post_cds_enable_config(pHddCtx);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: hdd_post_cds_enable_config failed", __func__);
 		goto err_cds_disable;
 	}
@@ -1521,7 +1521,7 @@ QDF_STATUS hdd_wlan_re_init(void *hif_sc)
 		if (!pAdapter) {
 			pAdapter = hdd_get_adapter(pHddCtx, WLAN_HDD_IBSS);
 			if (!pAdapter) {
-				hddLog(CDF_TRACE_LEVEL_FATAL,
+				hddLog(QDF_TRACE_LEVEL_FATAL,
 				       "%s: Failed to get Adapter!", __func__);
 			}
 		}
@@ -1637,7 +1637,7 @@ err_cds_close:
 err_re_init:
 	/* Allow the phone to go to sleep */
 	hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_DRIVER_REINIT);
-	CDF_BUG(0);
+	QDF_BUG(0);
 	return -EPERM;
 
 success:
@@ -1658,7 +1658,7 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode)
 	hdd_context_t *hdd_ctx;
 
 	if (NULL == adapter) {
-		hddLog(CDF_TRACE_LEVEL_FATAL, FL("Adapter NULL"));
+		hddLog(QDF_TRACE_LEVEL_FATAL, FL("Adapter NULL"));
 		return -ENODEV;
 	}
 
@@ -1668,12 +1668,12 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode)
 		return -EINVAL;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO_HIGH, FL("power mode=%d"), mode);
+	hddLog(QDF_TRACE_LEVEL_INFO_HIGH, FL("power mode=%d"), mode);
 	hal = WLAN_HDD_GET_HAL_CTX(adapter);
 
 
 	if (DRIVER_POWER_MODE_ACTIVE == mode) {
-		hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+		hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 		       FL("Wlan driver Entering Full Power"));
 
 		/*
@@ -1699,7 +1699,7 @@ wlan_hdd_set_powersave(hdd_adapter_t *adapter, enum hdd_power_mode mode)
 			sme_ps_enable_disable(hal, adapter->sessionId,
 					SME_PS_ENABLE);
 		} else {
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("Power Save is not enabled in the cfg"));
 		}
 	}
@@ -1752,7 +1752,7 @@ static int __wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 #endif
 	hdd_resume_wlan();
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_RESUME_WLAN,
 			 NO_SESSION, pHddCtx->isWiphySuspended));
 	qdf_spin_lock(&pHddCtx->sched_scan_lock);
@@ -2015,7 +2015,7 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	}
 	pHddCtx->is_ol_rx_thread_suspended = true;
 #endif
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SUSPEND_WLAN,
 			 NO_SESSION, pHddCtx->isWiphySuspended));
 	pHddCtx->isWiphySuspended = true;
@@ -2087,7 +2087,7 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_POWER_MGMT,
 			 pAdapter->sessionId, timeout));
 
@@ -2180,7 +2180,7 @@ static int __wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SET_TXPOWER,
 			 NO_SESSION, type));
 
@@ -2284,7 +2284,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 		return -ENOENT;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_TXPOWER,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	wlan_hdd_get_class_astats(pAdapter);
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 20c3853d9236..b965b7a7a5ec 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -766,11 +766,11 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info,
 						     scanReq->essid_len);
 				} else {
 					scanRequest.SSIDs.numOfSSIDs = 0;
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Unable to allocate memory",
 						  __func__);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 				}
 			}
 		}
@@ -833,7 +833,7 @@ static int __iw_set_scan(struct net_device *dev, struct iw_request_info *info,
 				  pAdapter->sessionId, &scanRequest,
 				  &hdd_scan_request_callback, dev);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s:sme_scan_request  fail %d!!!", __func__, status);
 		goto error;
 	}
@@ -904,12 +904,12 @@ static int __iw_get_scan(struct net_device *dev,
 	if (0 != ret)
 		return ret;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: enter buffer length %d!!!", __func__,
 		  (wrqu->data.length) ? wrqu->data.length : IW_SCAN_MAX_DATA);
 
 	if (true == pAdapter->scan_info.mScanPending) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s:mScanPending is true !!!", __func__);
 		return -EAGAIN;
 	}
@@ -945,7 +945,7 @@ static int __iw_get_scan(struct net_device *dev,
 
 	sme_scan_result_purge(hHal, pResult);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: exit total %d BSS reported !!!", __func__, i);
 	EXIT();
 	return status;
@@ -1110,14 +1110,14 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
 	if (0 != ret)
 		return QDF_STATUS_E_INVAL;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 		"%s called with hal = %p, pContext = %p, ID = %d, status = %d",
 		__func__, halHandle, pContext, (int)scanId, (int)status);
 
 	pScanInfo->mScanPendingCounter = 0;
 
 	if (pScanInfo->mScanPending != true) {
-		CDF_ASSERT(pScanInfo->mScanPending);
+		QDF_ASSERT(pScanInfo->mScanPending);
 		goto allow_suspend;
 	}
 
@@ -1131,7 +1131,7 @@ static QDF_STATUS hdd_cfg80211_scan_done_callback(tHalHandle halHandle,
 	ret = wlan_hdd_cfg80211_update_bss((WLAN_HDD_GET_CTX(pAdapter))->wiphy,
 					   pAdapter, scan_time);
 	if (0 > ret)
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__);
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: NO SCAN result", __func__);
 
 	/*
 	 * cfg80211_scan_done informing NL80211 about completion
@@ -1250,7 +1250,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SCAN,
 			 pAdapter->sessionId, request->n_channels));
 
@@ -1450,7 +1450,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 	 */
 
 	if (request->n_channels != WLAN_HDD_P2P_SINGLE_CHANNEL_SCAN) {
-		hddLog(CDF_TRACE_LEVEL_DEBUG, "Flushing P2P Results");
+		hddLog(QDF_TRACE_LEVEL_DEBUG, "Flushing P2P Results");
 		sme_scan_flush_p2p_result(WLAN_HDD_GET_HAL_CTX(pAdapter),
 					   pAdapter->sessionId);
 	}
@@ -1505,7 +1505,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 			/* no_cck will be set during p2p find to disable 11b rates */
 			if (request->no_cck) {
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "%s: This is a P2P Search", __func__);
 				scan_req.p2pSearch = 1;
 
@@ -2059,7 +2059,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 		return -EBUSY;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SCHED_SCAN_START,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	/*
@@ -2132,8 +2132,8 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 						&& (CHANNEL_STATE_DFS ==
 						cds_get_channel_state(
 						    channels_allowed[indx]))) {
-						CDF_TRACE(QDF_MODULE_ID_HDD,
-						    CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_HDD,
+						    QDF_TRACE_LEVEL_INFO,
 						    "%s : Dropping DFS channel : %d",
 						     __func__,
 						    channels_allowed[indx]);
@@ -2157,7 +2157,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 		 * then ignore the PNO request
 		 */
 		if (num_ignore_dfs_ch == request->n_channels) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				"%s : All requested channels are DFS channels",
 				 __func__);
 			ret = -EINVAL;
@@ -2355,7 +2355,7 @@ static int __wlan_hdd_cfg80211_sched_scan_stop(struct wiphy *wiphy,
 	pPnoRequest->enable = 0;        /* Disable PNO */
 	pPnoRequest->ucNetworksCount = 0;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_SCHED_SCAN_STOP,
 			 pAdapter->sessionId, pAdapter->device_mode));
 	status = sme_set_preferred_network_list(hHal, pPnoRequest,
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 56134c54e2a8..5404b3321eb0 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -58,25 +58,25 @@
  */
 static void hdd_softap_dump_sk_buff(struct sk_buff *skb)
 {
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: head = %p ", __func__, skb->head);
-	/* CDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	/* QDF_TRACE( QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,"%s: data = %p ", __func__, skb->data); */
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: tail = %p ", __func__, skb->tail);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: end = %p ", __func__, skb->end);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: len = %d ", __func__, skb->len);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: data_len = %d ", __func__, skb->data_len);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: mac_len = %d", __func__, skb->mac_len);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x ", skb->data[0],
 		  skb->data[1], skb->data[2], skb->data[3], skb->data[4],
 		  skb->data[5], skb->data[6], skb->data[7]);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", skb->data[8],
 		  skb->data[9], skb->data[10], skb->data[11], skb->data[12],
 		  skb->data[13], skb->data[14], skb->data[15]);
@@ -103,7 +103,7 @@ void hdd_softap_tx_resume_timer_expired_handler(void *adapter_context)
 	hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context;
 
 	if (!pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: INV ARG", __func__);
 		/* INVALID ARG */
 		return;
@@ -129,7 +129,7 @@ void hdd_softap_tx_resume_cb(void *adapter_context, bool tx_resume)
 	hdd_adapter_t *pAdapter = (hdd_adapter_t *) adapter_context;
 
 	if (!pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: INV ARG", __func__);
 		/* INVALID ARG */
 		return;
@@ -181,7 +181,7 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 * lead to a crash.
 	 */
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Recovery in Progress. Ignore!!!", __func__);
 		goto drop_pkt;
 	}
@@ -211,20 +211,20 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		if (QDF_STATUS_SUCCESS !=
 			 hdd_softap_get_sta_id(pAdapter,
 				 pDestMacAddress, &STAId)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-				  CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+				  QDF_TRACE_LEVEL_WARN,
 				  "%s: Failed to find right station", __func__);
 			goto drop_pkt;
 		}
 
 		if (STAId == HDD_WLAN_INVALID_STA_ID) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-				  CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+				  QDF_TRACE_LEVEL_WARN,
 				  "%s: Failed to find right station", __func__);
 			goto drop_pkt;
 		} else if (false == pAdapter->aStaInfo[STAId].isUsed) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-				  CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+				  QDF_TRACE_LEVEL_WARN,
 				  "%s: STA %d is unregistered", __func__,
 				  STAId);
 			goto drop_pkt;
@@ -234,15 +234,15 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		     pAdapter->aStaInfo[STAId].tlSTAState)
 		    && (ol_txrx_peer_state_auth !=
 			pAdapter->aStaInfo[STAId].tlSTAState)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-				  CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+				  QDF_TRACE_LEVEL_WARN,
 				  "%s: Station not connected yet", __func__);
 			goto drop_pkt;
 		} else if (ol_txrx_peer_state_conn ==
 			   pAdapter->aStaInfo[STAId].tlSTAState) {
 			if (ntohs(skb->protocol) != HDD_ETHERTYPE_802_1_X) {
-				CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+					  QDF_TRACE_LEVEL_WARN,
 					  "%s: NON-EAPOL packet in non-Authenticated state",
 					  __func__);
 				goto drop_pkt;
@@ -302,19 +302,19 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK;
 	NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD);
 
-	cdf_dp_trace_set_track(skb);
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_PTR_RECORD,
+	qdf_dp_trace_set_track(skb);
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD,
 				(uint8_t *)skb->data, sizeof(skb->data)));
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD,
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD,
 				(uint8_t *)skb->data, cdf_nbuf_len(skb)));
-	if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE)
-		DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD,
-				(uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE],
-				(cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE)));
+	if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
+		DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD,
+				(uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
+				(cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE)));
 
 	if (ol_tx_send_data_frame(STAId, skb,
 							  proto_type) != NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_WARN,
 			  "%s: Failed to send packet to txrx for staid:%d",
 			  __func__, STAId);
 		++pAdapter->hdd_stats.hddTxRxStats.txXmitDroppedAC[ac];
@@ -326,12 +326,12 @@ int hdd_softap_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 drop_pkt:
 
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD,
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
 				(uint8_t *)skb->data, cdf_nbuf_len(skb)));
-	if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE)
-		DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD,
-				(uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE],
-				(cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE)));
+	if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
+		DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
+				(uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
+				(cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE)));
 	kfree_skb(skb);
 
 drop_pkt_accounting:
@@ -356,9 +356,9 @@ static void __hdd_softap_tx_timeout(struct net_device *dev)
 	hdd_adapter_t *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	hdd_context_t *hdd_ctx;
 
-	DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT,
+	DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_HDD_SOFTAP_TX_TIMEOUT,
 				NULL, 0));
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Transmission timeout occurred", __func__);
 	/* Getting here implies we disabled the TX queues for too
 	 * long. Queues are disabled either because of disassociation
@@ -368,7 +368,7 @@ static void __hdd_softap_tx_timeout(struct net_device *dev)
 	 */
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			 "%s: Recovery in Progress. Ignore!!!", __func__);
 		return;
 	}
@@ -440,7 +440,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId,
 {
 	spin_lock_bh(&pAdapter->staInfo_lock);
 	if (pAdapter->aStaInfo[STAId].isUsed) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Reinit station %d", __func__, STAId);
 		spin_unlock_bh(&pAdapter->staInfo_lock);
 		return QDF_STATUS_E_FAILURE;
@@ -475,7 +475,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(hdd_adapter_t *pAdapter, uint8_t STAId)
 
 	if (false == pAdapter->aStaInfo[STAId].isUsed) {
 		spin_unlock_bh(&pAdapter->staInfo_lock);
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Deinit station not inited %d", __func__, STAId);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -514,14 +514,14 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context,
 
 	/* Sanity check on inputs */
 	if ((NULL == cds_context) || (NULL == rxBuf)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL == pHddCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is Null", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -543,7 +543,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *cds_context,
 
 	if (skb->dev == NULL) {
 
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: ERROR!!Invalid netdevice", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -608,13 +608,13 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId)
 	hdd_context_t *pHddCtx;
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pAdapter is NULL", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid pAdapter magic", __func__);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -626,7 +626,7 @@ QDF_STATUS hdd_softap_deregister_sta(hdd_adapter_t *pAdapter, uint8_t staId)
 	 */
 	qdf_status = ol_txrx_clear_peer(staId);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "ol_txrx_clear_peer() failed to for staID %d.  "
 			  "Status= %d [0x%08X]", staId, qdf_status, qdf_status);
 	}
@@ -672,7 +672,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 	 * Clean up old entry if it is not cleaned up properly
 	 */
 	if (pAdapter->aStaInfo[staId].isUsed) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 			  "clean up old entry for STA %d", staId);
 		hdd_softap_deregister_sta(pAdapter, staId);
 	}
@@ -688,7 +688,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 					  pPeerMacAddress);
 
 	staDesc.is_qos_enabled = fWmmEnabled;
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 		  "HDD SOFTAP register TL QoS_enabled=%d",
 		  staDesc.is_qos_enabled);
 
@@ -697,7 +697,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 		ol_txrx_register_peer(hdd_softap_rx_packet_cbk,
 					   &staDesc);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "SOFTAP ol_txrx_register_peer() failed to register.  Status= %d [0x%08X]",
 			  qdf_status, qdf_status);
 		return qdf_status;
@@ -713,7 +713,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 	pAdapter->aStaInfo[staId].isQosEnabled = fWmmEnabled;
 
 	if (!fAuthRequired) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 			  "open/shared auth StaId= %d.  Changing TL state to AUTHENTICATED at Join time",
 			  pAdapter->aStaInfo[staId].ucSTAId);
 
@@ -727,7 +727,7 @@ QDF_STATUS hdd_softap_register_sta(hdd_adapter_t *pAdapter,
 		pAdapter->sessionCtx.ap.uIsAuthenticated = true;
 	} else {
 
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 			  "ULA auth StaId= %d.  Changing TL state to CONNECTED at Join time",
 			  pAdapter->aStaInfo[staId].ucSTAId);
 
@@ -810,7 +810,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
 	 * unloading
 	 */
 	if (cds_is_load_or_unload_in_progress()) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Loading_unloading in Progress, state: 0x%x. Ignore!!!",
 			  __func__, cds_get_driver_state());
 		return QDF_STATUS_E_PERM;
@@ -819,7 +819,7 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
 	qdf_status = hdd_softap_deregister_bc_sta(pAdapter);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to deregister BC sta Id %d", __func__,
 			  (WLAN_HDD_GET_AP_CTX_PTR(pAdapter))->uBCStaId);
 	}
@@ -829,8 +829,8 @@ QDF_STATUS hdd_softap_stop_bss(hdd_adapter_t *pAdapter)
 		if (pAdapter->aStaInfo[staId].isUsed) {
 			qdf_status = hdd_softap_deregister_sta(pAdapter, staId);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-				CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: Failed to deregister sta Id %d",
 					  __func__, staId);
 			}
@@ -854,13 +854,13 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
 	uint8_t ucSTAId = WLAN_MAX_STA_COUNT;
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 		  "%s: enter", __func__);
 
 	if (QDF_STATUS_SUCCESS !=
 		 hdd_softap_get_sta_id(pAdapter,
 			 pDestMacAddress, &ucSTAId)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Failed to find right station", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -868,7 +868,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
 	if (false ==
 	    qdf_is_macaddr_equal(&pAdapter->aStaInfo[ucSTAId].macAddrSTA,
 				 pDestMacAddress)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Station MAC address does not matching",
 			  __func__);
 		return QDF_STATUS_E_FAILURE;
@@ -876,7 +876,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
 
 	qdf_status =
 		hdd_change_peer_state(pAdapter, ucSTAId, state, false);
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 		  "%s: change station to state %d succeed", __func__, state);
 
 	if (QDF_STATUS_SUCCESS == qdf_status) {
@@ -884,7 +884,7 @@ QDF_STATUS hdd_softap_change_sta_state(hdd_adapter_t *pAdapter,
 			ol_txrx_peer_state_auth;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO,
 		  "%s exit", __func__);
 
 	return qdf_status;
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 19d1d98ef447..93333ba91d2b 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -235,7 +235,7 @@ static bool put_wifi_rate_stat(tpSirWifiRateStat stats,
 	    nla_put_u32(vendor_event,
 			   QCA_WLAN_VENDOR_ATTR_LL_STATS_RATE_RETRIES_LONG,
 			   stats->retriesLong)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		return false;
 	}
@@ -268,7 +268,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats,
 	    nla_put_u32(vendor_event,
 			   QCA_WLAN_VENDOR_ATTR_LL_STATS_PEER_INFO_NUM_RATES,
 			   stats->numRate)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		goto error;
 	}
@@ -294,7 +294,7 @@ static bool put_wifi_peer_info(tpSirWifiPeerInfo stats,
 
 			if (false ==
 			    put_wifi_rate_stat(pRateStats, vendor_event)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 				return false;
 			}
@@ -362,7 +362,7 @@ static bool put_wifi_wmm_ac_stat(tpSirWifiWmmAcStat stats,
 	    nla_put_u32(vendor_event,
 			QCA_WLAN_VENDOR_ATTR_LL_STATS_WMM_AC_CONTENTION_NUM_SAMPLES,
 			stats->contentionNumSamples)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		return false;
 	}
@@ -407,7 +407,7 @@ static bool put_wifi_interface_info(tpSirWifiInterfaceInfo stats,
 	    nla_put(vendor_event,
 		    QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_INFO_COUNTRY_STR,
 		    WNI_CFG_COUNTRY_CODE_LEN, stats->countryStr)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		return false;
 	}
@@ -433,7 +433,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat,
 
 	if (false == put_wifi_interface_info(&pWifiIfaceStat->info,
 					     vendor_event)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		return false;
 
@@ -482,7 +482,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat,
 	    nla_put_u64(vendor_event,
 			QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_AVERAGE_TSF_OFFSET,
 			average_tsf_offset)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 		return false;
 	}
@@ -500,7 +500,7 @@ static bool put_wifi_iface_stats(tpSirWifiIfaceStat pWifiIfaceStat,
 		if (false ==
 		    put_wifi_wmm_ac_stat(&pWifiIfaceStat->AccessclassStats[i],
 					 vendor_event)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("put_wifi_wmm_ac_stat Fail"));
 			return false;
 		}
@@ -565,7 +565,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter,
 		}
 		if (eConnectionState_Connecting ==
 		    pHddStaCtx->conn_info.connState) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Session ID %d, Connection is in progress",
 			       __func__, pAdapter->sessionId);
 			pInfo->state = WIFI_ASSOCIATING;
@@ -576,7 +576,7 @@ static bool hdd_get_interface_info(hdd_adapter_t *pAdapter,
 			staMac =
 				(uint8_t *) &(pAdapter->macAddressCurrent.
 					      bytes[0]);
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: client " MAC_ADDRESS_STR
 			       " is in the middle of WPS/EAPOL exchange.",
 			       __func__, MAC_ADDR_ARRAY(staMac));
@@ -638,7 +638,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter,
 	if (0 != status)
 		return;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "LL_STATS_PEER_ALL : numPeers %u, more data = %u",
 	       pWifiPeerStat->numPeers, more_data);
 
@@ -668,7 +668,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter,
 	    nla_put_u32(vendor_event,
 			QCA_WLAN_VENDOR_ATTR_LL_STATS_IFACE_NUM_PEERS,
 			pWifiPeerStat->numPeers)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: QCA_WLAN_VENDOR_ATTR put fail", __func__);
 
 		kfree_skb(vendor_event);
@@ -700,7 +700,7 @@ static void hdd_link_layer_process_peer_stats(hdd_adapter_t *pAdapter,
 
 			if (false ==
 			    put_wifi_peer_info(pWifiPeerInfo, vendor_event)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("put_wifi_peer_info fail"));
 				kfree_skb(vendor_event);
 				return;
@@ -765,15 +765,15 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter,
 				LL_STATS_EVENT_BUF_SIZE);
 
 	if (!vendor_event) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("cfg80211_vendor_cmd_alloc_reply_skb failed"));
 		return;
 	}
 
-	hddLog(CDF_TRACE_LEVEL_INFO, "WMI_LINK_STATS_IFACE Data");
+	hddLog(QDF_TRACE_LEVEL_INFO, "WMI_LINK_STATS_IFACE Data");
 
 	if (false == hdd_get_interface_info(pAdapter, &pWifiIfaceStat->info)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("hdd_get_interface_info get fail"));
 		kfree_skb(vendor_event);
 		return;
@@ -781,7 +781,7 @@ static void hdd_link_layer_process_iface_stats(hdd_adapter_t *pAdapter,
 
 	if (false ==
 	    put_wifi_iface_stats(pWifiIfaceStat, num_peers, vendor_event)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("put_wifi_iface_stats fail"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("put_wifi_iface_stats fail"));
 		kfree_skb(vendor_event);
 		return;
 	}
@@ -822,7 +822,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter,
 	if (0 != status)
 		return;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "LL_STATS_RADIO"
 	       " number of radios = %u"
 	       " radio is %d onTime is %u"
@@ -903,7 +903,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter,
 	    nla_put_u32(vendor_event,
 			QCA_WLAN_VENDOR_ATTR_LL_STATS_RADIO_NUM_CHANNELS,
 			pWifiRadioStat->numChannels)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("QCA_WLAN_VENDOR_ATTR put fail"));
 
 		kfree_skb(vendor_event);
@@ -957,7 +957,7 @@ static void hdd_link_layer_process_radio_stats(hdd_adapter_t *pAdapter,
 			    nla_put_u32(vendor_event,
 					   QCA_WLAN_VENDOR_ATTR_LL_STATS_CHANNEL_CCA_BUSY_TIME,
 					   pWifiChannelStats->ccaBusyTime)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("nla_put failed"));
 				kfree_skb(vendor_event);
 				return;
@@ -994,7 +994,7 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx,
 	status = wlan_hdd_validate_context(pHddCtx);
 
 	if (0 != status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return;
 	}
 
@@ -1002,19 +1002,19 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx,
 					   linkLayerStatsResults->ifaceId);
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: vdev_id %d does not exist with host",
 			  __func__, linkLayerStatsResults->ifaceId);
 		return;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Link Layer Indication indType: %d", __func__, indType);
 
 	switch (indType) {
 	case SIR_HAL_LL_STATS_RESULTS_RSP:
 	{
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 			"LL_STATS RESP paramID = 0x%x, ifaceId = %u, respId= %u , moreResultToFollow = %u, num radio = %u result = %p",
 			linkLayerStatsResults->paramId,
 			linkLayerStatsResults->ifaceId,
@@ -1092,7 +1092,7 @@ static void wlan_hdd_cfg80211_link_layer_stats_callback(void *ctx,
 		break;
 	}
 	default:
-		hddLog(CDF_TRACE_LEVEL_ERROR, "invalid event type %d", indType);
+		hddLog(QDF_TRACE_LEVEL_ERROR, "invalid event type %d", indType);
 		break;
 	}
 
@@ -1156,20 +1156,20 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 	if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_MAX,
 		      (struct nlattr *)data,
 		      data_len, qca_wlan_vendor_ll_set_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("maximum attribute not present"));
 		return -EINVAL;
 	}
 
 	if (!tb_vendor
 	    [QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_MPDU_SIZE_THRESHOLD]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("MPDU size Not present"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("MPDU size Not present"));
 		return -EINVAL;
 	}
 
 	if (!tb_vendor
 	    [QCA_WLAN_VENDOR_ATTR_LL_STATS_SET_CONFIG_AGGRESSIVE_STATS_GATHERING]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Stats Gathering Not Present"));
 		return -EINVAL;
 	}
@@ -1187,7 +1187,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 
 	LinkLayerStatsSetReq.staId = pAdapter->sessionId;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 		"LL_STATS_SET reqId = %d, staId = %d, mpduSizeThreshold = %d, Statistics Gathering  = %d",
 		LinkLayerStatsSetReq.reqId, LinkLayerStatsSetReq.staId,
 		LinkLayerStatsSetReq.mpduSizeThreshold,
@@ -1195,7 +1195,7 @@ __wlan_hdd_cfg80211_ll_stats_set(struct wiphy *wiphy,
 
 	if (QDF_STATUS_SUCCESS != sme_ll_stats_set_req(pHddCtx->hHal,
 						       &LinkLayerStatsSetReq)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s:"
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s:"
 		       "sme_ll_stats_set_req Failed", __func__);
 		return -EINVAL;
 	}
@@ -1287,17 +1287,17 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 	if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_MAX,
 		      (struct nlattr *)data,
 		      data_len, qca_wlan_vendor_ll_get_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("max attribute not present"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("max attribute not present"));
 		return -EINVAL;
 	}
 
 	if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_ID]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Request Id Not present"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Request Id Not present"));
 		return -EINVAL;
 	}
 
 	if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_GET_CONFIG_REQ_MASK]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Req Mask Not present"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Req Mask Not present"));
 		return -EINVAL;
 	}
 
@@ -1310,7 +1310,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 
 	LinkLayerStatsGetReq.staId = pAdapter->sessionId;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 		"LL_STATS_GET reqId = %d, staId = %d, paramIdMask = %d",
 		LinkLayerStatsGetReq.reqId,
 		LinkLayerStatsGetReq.staId,
@@ -1325,7 +1325,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
 
 	if (QDF_STATUS_SUCCESS != sme_ll_stats_get_req(pHddCtx->hHal,
 						       &LinkLayerStatsGetReq)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s:"
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s:"
 		       "sme_ll_stats_get_req Failed", __func__);
 		return -EINVAL;
 	}
@@ -1411,7 +1411,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 		return -EINVAL;
 
 	if (!pAdapter->isLinkLayerStatsSet) {
-		hddLog(CDF_TRACE_LEVEL_FATAL,
+		hddLog(QDF_TRACE_LEVEL_FATAL,
 		       "%s: isLinkLayerStatsSet : %d",
 		       __func__, pAdapter->isLinkLayerStatsSet);
 		return -EINVAL;
@@ -1420,14 +1420,14 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 	if (nla_parse(tb_vendor, QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_MAX,
 		      (struct nlattr *)data,
 		      data_len, qca_wlan_vendor_ll_clr_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("STATS_CLR_MAX is not present"));
 		return -EINVAL;
 	}
 
 	if (!tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_REQ_MASK] ||
 	    !tb_vendor[QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_REQ]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Error in LL_STATS CLR CONFIG PARA"));
 		return -EINVAL;
 	}
@@ -1447,7 +1447,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 
 	LinkLayerStatsClearReq.staId = pAdapter->sessionId;
 
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 		"LL_STATS_CLEAR reqId = %d, staId = %d, statsClearReqMask = 0x%X, stopReq  = %d",
 		LinkLayerStatsClearReq.reqId,
 		LinkLayerStatsClearReq.staId,
@@ -1468,7 +1468,7 @@ __wlan_hdd_cfg80211_ll_stats_clear(struct wiphy *wiphy,
 			    nla_put_u32(temp_skbuff,
 					QCA_WLAN_VENDOR_ATTR_LL_STATS_CLR_CONFIG_STOP_RSP,
 					stopReq)) {
-				hddLog(CDF_TRACE_LEVEL_ERROR,
+				hddLog(QDF_TRACE_LEVEL_ERROR,
 				       FL("LL_STATS_CLR put fail"));
 				kfree_skb(temp_skbuff);
 				return -EINVAL;
@@ -1607,7 +1607,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx,
 	status = wlan_hdd_validate_context(pHddCtx);
 
 	if (0 != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is not valid", __func__);
 		return;
 	}
@@ -1615,7 +1615,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx,
 	pAdapter = hdd_get_adapter_by_vdev(pHddCtx, data->vdev_id);
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: vdev_id %d does not exist with host",
 			  __func__, data->vdev_id);
 		return;
@@ -1630,7 +1630,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx,
 						   GFP_KERNEL);
 
 	if (!vendor_event) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: cfg80211_vendor_event_alloc failed", __func__);
 		return;
 	}
@@ -1638,7 +1638,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx,
 	ret_val = nla_put_u32(vendor_event, QCA_WLAN_VENDOR_ATTR_IFINDEX,
 			      pAdapter->dev->ifindex);
 	if (ret_val) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: QCA_WLAN_VENDOR_ATTR_IFINDEX put fail",
 			  __func__);
 		kfree_skb(vendor_event);
@@ -1650,7 +1650,7 @@ static void wlan_hdd_cfg80211_stats_ext_callback(void *ctx,
 			  data->event_data_len, data->event_data);
 
 	if (ret_val) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: QCA_WLAN_VENDOR_ATTR_STATS_EXT put fail",
 			  __func__);
 		kfree_skb(vendor_event);
@@ -2161,7 +2161,7 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
 			sinfo->txrate.mcs, sinfo->txrate.flags,
 			sinfo->tx_packets, sinfo->rx_packets);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_GET_STA,
 			 pAdapter->sessionId, maxRate));
 	EXIT();
@@ -2272,7 +2272,7 @@ static int __wlan_hdd_cfg80211_dump_survey(struct wiphy *wiphy,
 	wlan_hdd_get_snr(pAdapter, &snr);
 	wlan_hdd_get_rssi(pAdapter, &rssi);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_DUMP_SURVEY,
 			 pAdapter->sessionId, pAdapter->device_mode));
 
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index 8509892cc967..67e0c26d70e9 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -196,7 +196,7 @@ void wlan_hdd_tdls_pre_setup_init_work(tdlsCtx_t *pHddTdlsCtx,
 				       hddTdlsPeer_t *curr_candidate)
 {
 	if (!pHddTdlsCtx || !curr_candidate) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: either pHddTdlsCtx or curr_candidate is null",
 			  __func__);
 		return;
@@ -266,7 +266,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter)
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	if ((NULL == pHddTdlsCtx) || (NULL == pHddCtx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx or pHddTdlsCtx points to NULL"));
 		return;
 	}
@@ -293,7 +293,7 @@ static void wlan_hdd_tdls_check_power_save_prohibited(hdd_adapter_t *pAdapter)
 static void wlan_hdd_tdls_free_scan_request(tdls_scan_context_t *tdls_scan_ctx)
 {
 	if (NULL == tdls_scan_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("tdls_scan_ctx is NULL"));
 		return;
 	}
@@ -325,7 +325,7 @@ static void wlan_hdd_tdls_discovery_timeout_peer_cb(void *userData)
 	pHddTdlsCtx = (tdlsCtx_t *) userData;
 
 	if ((NULL == pHddTdlsCtx) || (NULL == pHddTdlsCtx->pAdapter)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddTdlsCtx or pAdapter points to NULL"));
 		return;
 	}
@@ -381,7 +381,7 @@ static void wlan_hdd_tdls_free_list(tdlsCtx_t *pHddTdlsCtx)
 	struct list_head *pos, *q;
 
 	if (NULL == pHddTdlsCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddTdlsCtx is NULL"));
 		return;
 	}
@@ -408,7 +408,7 @@ static void wlan_hdd_tdls_schedule_scan(struct work_struct *work)
 		container_of(work, tdls_scan_context_t, tdls_scan_work.work);
 
 	if (NULL == scan_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("scan_ctx is NULL"));
 		return;
 	}
@@ -650,7 +650,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter)
 
 	if (false == pHddCtx->config->fEnableTDLSImplicitTrigger) {
 		pHddCtx->tdls_mode = eTDLS_SUPPORT_EXPLICIT_TRIGGER_ONLY;
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s TDLS Implicit trigger not enabled!", __func__);
 	} else if (true == pHddCtx->config->fTDLSExternalControl) {
 		pHddCtx->tdls_mode = eTDLS_SUPPORT_EXTERNAL_CONTROL;
@@ -679,7 +679,7 @@ int wlan_hdd_tdls_init(hdd_adapter_t *pAdapter)
 	mutex_unlock(&pHddCtx->tdls_lock);
 	tInfo = cdf_mem_malloc(sizeof(tdlsInfo_t));
 	if (NULL == tInfo) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("cdf_mem_alloc failed for tInfo"));
 		qdf_mc_timer_destroy(&pHddTdlsCtx->peerDiscoveryTimeoutTimer);
 		cdf_mem_free(pHddTdlsCtx);
@@ -748,7 +748,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter)
 
 	pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 	if (!pHddCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx is NULL"));
 		return;
 	}
@@ -830,7 +830,7 @@ void wlan_hdd_tdls_exit(hdd_adapter_t *pAdapter)
 				cdf_mem_free(tInfo);
 			}
 		} else {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: cdf_mem_alloc failed for tInfo", __func__);
 		}
 	}
@@ -899,7 +899,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_get_peer(hdd_adapter_t *pAdapter, const u8 *mac)
 	/* not found, allocate and add the list */
 	peer = cdf_mem_malloc(sizeof(hddTdlsPeer_t));
 	if (NULL == peer) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s peer malloc failed!",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s peer malloc failed!",
 		       __func__);
 		return NULL;
 	}
@@ -972,23 +972,23 @@ void wlan_hdd_tdls_set_peer_link_status(hddTdlsPeer_t *curr_peer,
 	int32_t res = 0;
 	hdd_context_t *pHddCtx;
 	if (curr_peer == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("curr_peer is NULL"));
 		return;
 	}
 
 	if (curr_peer->pHddTdlsCtx == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("curr_peer->pHddTdlsCtx is NULL"));
 		return;
 	}
 	pHddCtx = WLAN_HDD_GET_CTX(curr_peer->pHddTdlsCtx->pAdapter);
 	if (0 != (wlan_hdd_validate_context(pHddCtx))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx is not valid"));
 		return;
 	}
-	hddLog(CDF_TRACE_LEVEL_WARN,
+	hddLog(QDF_TRACE_LEVEL_WARN,
 	       "tdls set peer " MAC_ADDRESS_STR " link status to %u",
 	       MAC_ADDR_ARRAY(curr_peer->peerMac), status);
 
@@ -1041,13 +1041,13 @@ void wlan_hdd_tdls_set_link_status(hdd_adapter_t *pAdapter,
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	if (0 != (wlan_hdd_validate_context(pHddCtx))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx is not valid"));
 		return;
 	}
 	curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, true);
 	if (curr_peer == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("curr_peer is NULL"));
 		return;
 	}
@@ -1630,7 +1630,7 @@ int wlan_hdd_tdls_set_params(struct net_device *dev,
 
 	tdlsParams = cdf_mem_malloc(sizeof(tdlsInfo_t));
 	if (NULL == tdlsParams) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: cdf_mem_alloc failed for tdlsParams", __func__);
 		return -ENOMEM;
 	}
@@ -1701,13 +1701,13 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited,
 
 	if (!hdd_tdls_ctx) {
 		/* may be TDLS is not applicable for this adapter */
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD TDLS context is null"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD TDLS context is null"));
 		return;
 	}
 
 	/* If TDLS support is disabled then no need to update target */
 	if (false == hdd_ctx->config->fEnableTDLSSupport) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("TDLS not enabled"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("TDLS not enabled"));
 		return;
 	}
 
@@ -1726,7 +1726,7 @@ void wlan_hdd_update_tdls_info(hdd_adapter_t *adapter, bool tdls_prohibited,
 	mutex_unlock(&hdd_ctx->tdls_lock);
 	tdls_param = cdf_mem_malloc(sizeof(*tdls_param));
 	if (!tdls_param) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 			FL("memory allocation failed for tdlsParams"));
 		return;
 	}
@@ -1943,7 +1943,7 @@ hddTdlsPeer_t *wlan_hdd_tdls_find_peer(hdd_adapter_t *pAdapter,
 	list_for_each(pos, head) {
 		curr_peer = list_entry(pos, hddTdlsPeer_t, node);
 		if (!memcmp(mac, curr_peer->peerMac, 6)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "findTdlsPeer: found staId %d",
 				  curr_peer->staId);
 			if (mutexLock)
@@ -2081,7 +2081,7 @@ uint16_t wlan_hdd_tdls_connected_peers(hdd_adapter_t *pAdapter)
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	if (0 != (wlan_hdd_validate_context(pHddCtx))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx is not valid"));
 		return 0;
 	}
@@ -2167,7 +2167,7 @@ void wlan_hdd_tdls_connection_callback(hdd_adapter_t *pAdapter)
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx or pHddTdlsCtx points to NULL"));
 		return;
 	}
@@ -2201,7 +2201,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter)
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
 
 	if ((NULL == pHddCtx) || (NULL == pHddTdlsCtx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx or pHddTdlsCtx points to NULL"));
 		return;
 	}
@@ -2212,7 +2212,7 @@ void wlan_hdd_tdls_disconnection_callback(hdd_adapter_t *pAdapter)
 
 	if (NULL == pHddTdlsCtx) {
 		mutex_unlock(&pHddCtx->tdls_lock);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddTdlsCtx is NULL"));
 		return;
 	}
@@ -2322,7 +2322,7 @@ static hddTdlsPeer_t *wlan_hdd_tdls_find_progress_peer(hdd_adapter_t *pAdapter,
 	tdlsCtx_t *pHddTdlsCtx = WLAN_HDD_GET_TDLS_CTX_PTR(pAdapter);;
 
 	if (NULL == pHddTdlsCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddTdlsCtx is NULL"));
 		return NULL;
 	}
@@ -2409,13 +2409,13 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work)
 	ENTER();
 
 	if (NULL == pHddTdlsCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddTdlsCtx is NULL"));
 		return;
 	}
 
 	if (unlikely(TDLS_CTX_MAGIC != pHddTdlsCtx->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: tdls magic number mis-match %u",
 			  __func__, pHddTdlsCtx->magic);
 		return;
@@ -2431,7 +2431,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work)
 	curr_peer = pHddTdlsCtx->curr_candidate;
 
 	if (NULL == curr_peer) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("pHddCtx is not valid"));
 		goto done;
 	}
@@ -2463,7 +2463,7 @@ static void __wlan_hdd_tdls_pre_setup(struct work_struct *work)
 	if (false == curr_peer->isForcedPeer) {
 		if (curr_peer->discovery_attempt >=
 		    pHddTdlsCtx->threshold_config.discovery_tries_n) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: discovery attempt (%d) reached max (%d) for peer "
 				  MAC_ADDRESS_STR
 				  ", ignore discovery trigger from fw",
@@ -2865,7 +2865,7 @@ void wlan_hdd_tdls_indicate_teardown(hdd_adapter_t *pAdapter,
 				     hddTdlsPeer_t *curr_peer, uint16_t reason)
 {
 	if (NULL == pAdapter || NULL == curr_peer) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("parameters passed are invalid"));
 		return;
 	}
@@ -2978,7 +2978,7 @@ int wlan_hdd_tdls_get_status(hdd_adapter_t *pAdapter,
 	curr_peer = wlan_hdd_tdls_find_peer(pAdapter, mac, false);
 	if (curr_peer == NULL) {
 		mutex_unlock(&pHddCtx->tdls_lock);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("curr_peer is NULL"));
 		*state = QCA_WIFI_HAL_TDLS_DISABLED;
 		*reason = eTDLS_LINK_UNSPECIFIED;
@@ -3077,32 +3077,32 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy,
 	}
 	if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAX,
 		      data, data_len, wlan_hdd_tdls_config_get_status_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid attribute"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid attribute"));
 		return -EINVAL;
 	}
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAC_ADDR]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
 		return -EINVAL;
 	}
 	memcpy(peer,
 	       nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_MAC_ADDR]),
 	       sizeof(peer));
-	hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
+	hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
 	ret = wlan_hdd_tdls_get_status(pAdapter, peer, &global_operating_class,
 				&channel, &state, &reason);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("get status Failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("get status Failed"));
 		return -EINVAL;
 	}
 	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy,
 						  4 * sizeof(int32_t) +
 						  NLMSG_HDRLEN);
 	if (!skb) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("cfg80211_vendor_cmd_alloc_reply_skb failed"));
 		return -EINVAL;
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Reason %d Status %d class %d channel %d peer " MAC_ADDRESS_STR),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Reason %d Status %d class %d channel %d peer " MAC_ADDRESS_STR),
 		reason, state, global_operating_class, channel,
 		MAC_ADDR_ARRAY(peer));
 	if (nla_put_u32(skb,
@@ -3117,7 +3117,7 @@ __wlan_hdd_cfg80211_exttdls_get_status(struct wiphy *wiphy,
 		nla_put_u32(skb,
 			QCA_WLAN_VENDOR_ATTR_TDLS_GET_STATUS_CHANNEL,
 			channel)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
 		goto nla_put_failure;
 	}
 	ret = cfg80211_vendor_cmd_reply(skb);
@@ -3184,11 +3184,11 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac,
 					  QCA_NL80211_VENDOR_SUBCMD_TDLS_STATE_CHANGE_INDEX,
 					  GFP_KERNEL);
 	if (!skb) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("cfg80211_vendor_event_alloc failed"));
 		return -EINVAL;
 	}
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Reason: %d Status: %d Class: %d Channel: %d tdls peer " MAC_ADDRESS_STR),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Reason: %d Status: %d Class: %d Channel: %d tdls peer " MAC_ADDRESS_STR),
 		reason, state, global_operating_class, channel,
 		MAC_ADDR_ARRAY(mac));
 	if (nla_put(skb, QCA_WLAN_VENDOR_ATTR_TDLS_STATE_MAC_ADDR,
@@ -3202,7 +3202,7 @@ static int wlan_hdd_cfg80211_exttdls_callback(const uint8_t *mac,
 		nla_put_u32(skb,
 			QCA_WLAN_VENDOR_ATTR_TDLS_STATE_GLOBAL_OPERATING_CLASS,
 			global_operating_class)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("nla put fail"));
 		goto nla_put_failure;
 	}
 	cfg80211_vendor_event(skb, GFP_KERNEL);
@@ -3252,55 +3252,55 @@ __wlan_hdd_cfg80211_exttdls_enable(struct wiphy *wiphy,
 	if (0 != status)
 		return -EINVAL;
 	if (pHddCtx->config->fTDLSExternalControl == false) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("TDLS External Control is not enabled"));
 		return -ENOTSUPP;
 	}
 	if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX,
 		      data, data_len, wlan_hdd_tdls_config_enable_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
 		return -EINVAL;
 	}
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
 		return -EINVAL;
 	}
 	memcpy(peer, nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR]),
 	       sizeof(peer));
-	hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
+	hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_CHANNEL]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr channel failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr channel failed"));
 		return -EINVAL;
 	}
 	pReqMsg.channel =
 		nla_get_s32(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_CHANNEL]);
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Channel Num (%d)"), pReqMsg.channel);
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Channel Num (%d)"), pReqMsg.channel);
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_GLOBAL_OPERATING_CLASS]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("attr operating class failed"));
 		return -EINVAL;
 	}
 	pReqMsg.global_operating_class =
 		nla_get_s32(tb
 			    [QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_GLOBAL_OPERATING_CLASS]);
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Operating class (%d)"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Operating class (%d)"),
 	       pReqMsg.global_operating_class);
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX_LATENCY_MS]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr latency failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr latency failed"));
 		return -EINVAL;
 	}
 	pReqMsg.max_latency_ms =
 		nla_get_s32(tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAX_LATENCY_MS]);
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Latency (%d)"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Latency (%d)"),
 	       pReqMsg.max_latency_ms);
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MIN_BANDWIDTH_KBPS]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr bandwidth failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr bandwidth failed"));
 		return -EINVAL;
 	}
 	pReqMsg.min_bandwidth_kbps =
 		nla_get_s32(tb
 			    [QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MIN_BANDWIDTH_KBPS]);
-	hddLog(CDF_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"),
+	hddLog(QDF_TRACE_LEVEL_INFO, FL("Bandwidth (%d)"),
 	       pReqMsg.min_bandwidth_kbps);
 	ret = wlan_hdd_tdls_extctrl_config_peer(
 					pAdapter,
@@ -3375,16 +3375,16 @@ static int __wlan_hdd_cfg80211_exttdls_disable(struct wiphy *wiphy,
 	}
 	if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAX,
 		      data, data_len, wlan_hdd_tdls_config_disable_policy)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("Invalid ATTR"));
 		return -EINVAL;
 	}
 	if (!tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAC_ADDR]) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("attr mac addr failed"));
 		return -EINVAL;
 	}
 	memcpy(peer, nla_data(tb[QCA_WLAN_VENDOR_ATTR_TDLS_DISABLE_MAC_ADDR]),
 	       sizeof(peer));
-	hddLog(CDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
+	hddLog(QDF_TRACE_LEVEL_INFO, FL(MAC_ADDRESS_STR), MAC_ADDR_ARRAY(peer));
 	status = wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer);
 	EXIT();
 	return status;
@@ -3439,7 +3439,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 
 	ret = wlan_hdd_validate_context(pHddCtx);
 	if (0 != ret) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("HDD context is not valid"));
 		return ret;
 	}
 
@@ -3501,7 +3501,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 	   but need to check if any other errno fit into this category. */
 	numCurrTdlsPeers = wlan_hdd_tdls_connected_peers(pAdapter);
 	if (pHddCtx->max_num_tdls_sta <= numCurrTdlsPeers) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: " MAC_ADDRESS_STR
 			  " TDLS Max peer already connected. Request declined."
 			  " Num of peers (%d), Max allowed (%d).",
@@ -3512,7 +3512,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 		hddTdlsPeer_t *pTdlsPeer;
 		pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, mac, true);
 		if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: " MAC_ADDRESS_STR
 				  " already connected. Request declined.",
 				  __func__, MAC_ADDR_ARRAY(mac));
@@ -3552,7 +3552,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 		}
 		{
 			int i = 0;
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 				  "Supported rates:");
 			for (i = 0; i < sizeof(StaParams->supported_rates); i++)
 				hddLog(LOG1, "[%d]: %x ", i,
@@ -3560,7 +3560,7 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 		}
 	} /* end debug code */
 	else if ((1 == update) && (NULL == StaParams)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s : update is true, but staParams is NULL. Error!",
 			  __func__);
 		return -EPERM;
@@ -3582,14 +3582,14 @@ int wlan_hdd_tdls_add_station(struct wiphy *wiphy,
 						 (WAIT_TIME_TDLS_ADD_STA));
 
 	if (!rc) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: timeout waiting for tdls add station indication",
 			  __func__);
 		return -EPERM;
 	}
 
 	if (QDF_STATUS_SUCCESS != pAdapter->tdlsAddStaStatus) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Add Station is unsuccessful", __func__);
 		return -EPERM;
 	}
@@ -3688,12 +3688,12 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TDLS_MGMT,
 			 pAdapter->sessionId, action_code));
 
 	if (0 != wlan_hdd_validate_context(pHddCtx)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is not valid", __func__);
 		return -EINVAL;
 	}
@@ -3724,7 +3724,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 	/* If any concurrency is detected */
 	if (((1 << QDF_STA_MODE) != pHddCtx->concurrency_mode) ||
 	    (pHddCtx->no_of_active_sessions[QDF_STA_MODE] > 1)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Multiple STA OR Concurrency detected. Ignore TDLS MGMT frame. action_code=%d, concurrency_mode: 0x%x, active_sessions: %d",
 			  __func__,
 			  action_code,
@@ -3746,7 +3746,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 
 	if (WLAN_IS_TDLS_SETUP_ACTION(action_code)) {
 		if (NULL != wlan_hdd_tdls_is_progress(pHddCtx, peer, true)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: " MAC_ADDRESS_STR
 				  " TDLS setup is ongoing. action %d declined.",
 				  __func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -3763,8 +3763,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 			   check again in addtion to add_station().
 			   Anyway, there is no hard to double-check. */
 			if (SIR_MAC_TDLS_SETUP_REQ == action_code) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: " MAC_ADDRESS_STR
 					  " TDLS Max peer already connected. action (%d) declined. Num of peers (%d), Max allowed (%d).",
 					  __func__, MAC_ADDR_ARRAY(peer),
@@ -3775,8 +3775,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 				/* maximum reached. tweak to send error code to peer and return
 				   error code to supplicant */
 				status_code = eSIR_MAC_UNSPEC_FAILURE_STATUS;
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: " MAC_ADDRESS_STR
 					  " TDLS Max peer already connected, send response status (%d). Num of peers (%d), Max allowed (%d).",
 					  __func__, MAC_ADDR_ARRAY(peer),
@@ -3791,8 +3791,8 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 			pTdlsPeer =
 				wlan_hdd_tdls_find_peer(pAdapter, peer, true);
 			if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer)) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s:" MAC_ADDRESS_STR
 					  " already connected. action %d declined.",
 					  __func__, MAC_ADDR_ARRAY(peer),
@@ -3819,7 +3819,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 		if (pTdlsPeer && TDLS_IS_CONNECTED(pTdlsPeer))
 			responder = pTdlsPeer->is_responder;
 		else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: " MAC_ADDRESS_STR
 				  " peer doesn't exist or not connected %d dialog_token %d status %d, len = %zu",
 				  __func__, MAC_ADDR_ARRAY(peer),
@@ -3843,7 +3843,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 
 	/* make sure doesn't call send_mgmt() while it is pending */
 	if (TDLS_CTX_MAGIC == pAdapter->mgmtTxCompletionStatus) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: " MAC_ADDRESS_STR
 			  " action %d couldn't sent, as one is pending. return EBUSY",
 			  __func__, MAC_ADDR_ARRAY(peer), action_code);
@@ -3860,7 +3860,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					  !responder);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_send_tdls_mgmt_frame failed!", __func__);
 		pAdapter->mgmtTxCompletionStatus = false;
 		return -EINVAL;
@@ -3882,7 +3882,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
 					 msecs_to_jiffies(WAIT_TIME_TDLS_MGMT));
 
 	if ((0 == rc) || (true != pAdapter->mgmtTxCompletionStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Mgmt Tx Completion timed out TxCompletion %u",
 			  __func__, pAdapter->mgmtTxCompletionStatus);
 
@@ -4028,25 +4028,25 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter,
 {
 	hddTdlsPeer_t *pTdlsPeer;
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s : NL80211_TDLS_SETUP for " MAC_ADDRESS_STR,
 		  __func__, MAC_ADDR_ARRAY(peer));
 	if ((false == pHddCtx->config->fTDLSExternalControl) ||
 	    (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s TDLS External control or Implicit Trigger not enabled ",
 			  __func__);
 		return -ENOTSUPP;
 	}
 	pTdlsPeer = wlan_hdd_tdls_get_peer(pAdapter, peer);
 	if (pTdlsPeer == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: peer " MAC_ADDRESS_STR " does not exist",
 			  __func__, MAC_ADDR_ARRAY(peer));
 		return -EINVAL;
 	}
 	if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, true)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s TDLS Add Force Peer Failed", __func__);
 		return -EINVAL;
 	}
@@ -4070,13 +4070,13 @@ int wlan_hdd_tdls_extctrl_config_peer(hdd_adapter_t *pAdapter,
 	if (0 != wlan_hdd_tdls_set_extctrl_param(pAdapter, peer,
 						 chan, max_latency,
 						 op_class, min_bandwidth)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s TDLS Set Peer's External Ctrl Parameter Failed",
 			  __func__);
 		return -EINVAL;
 	}
 	if (0 != wlan_hdd_set_callback(pTdlsPeer, callback)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s TDLS set callback Failed", __func__);
 		return -EINVAL;
 	}
@@ -4096,19 +4096,19 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter,
 {
 	hddTdlsPeer_t *pTdlsPeer;
 	hdd_context_t *pHddCtx = WLAN_HDD_GET_CTX(pAdapter);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s : NL80211_TDLS_TEARDOWN for " MAC_ADDRESS_STR,
 		  __func__, MAC_ADDR_ARRAY(peer));
 	if ((false == pHddCtx->config->fTDLSExternalControl) ||
 	    (false == pHddCtx->config->fEnableTDLSImplicitTrigger)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s TDLS External control or Implicit Trigger not enabled ",
 			  __func__);
 		return -ENOTSUPP;
 	}
 	pTdlsPeer = wlan_hdd_tdls_find_peer(pAdapter, peer, true);
 	if (NULL == pTdlsPeer) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: " MAC_ADDRESS_STR
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: " MAC_ADDRESS_STR
 		       "peer matching MAC_ADDRESS_STR not found",
 		       __func__, MAC_ADDR_ARRAY(peer));
 		return -EINVAL;
@@ -4117,7 +4117,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter,
 						eSIR_MAC_TDLS_TEARDOWN_UNSPEC_REASON);
 	}
 	if (0 != wlan_hdd_tdls_set_force_peer(pAdapter, peer, false)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s Failed", __func__);
 		return -EINVAL;
 	}
@@ -4131,7 +4131,7 @@ int wlan_hdd_tdls_extctrl_deconfig_peer(hdd_adapter_t *pAdapter,
 		return -EINVAL;
 	}
 	if (0 != wlan_hdd_set_callback(pTdlsPeer, NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s TDLS set callback Failed", __func__);
 		return -EINVAL;
 	}
@@ -4167,11 +4167,11 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_HDD,
+	MTRACE(qdf_trace(QDF_MODULE_ID_HDD,
 			 TRACE_CODE_HDD_CFG80211_TDLS_OPER,
 			 pAdapter->sessionId, oper));
 	if (NULL == peer) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid arguments", __func__);
 		return -EINVAL;
 	}
@@ -4185,7 +4185,7 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 	 * received from target, so HDD config gives combined intersected result
 	 */
 	if (false == pHddCtx->config->fEnableTDLSSupport) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "TDLS Disabled in INI OR not enabled in FW. "
 			  "Cannot process TDLS commands");
 		return -ENOTSUPP;
@@ -4202,23 +4202,23 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 			wlan_hdd_tdls_find_peer(pAdapter, peer, true);
 
 		if (NULL == pTdlsPeer) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: peer matching " MAC_ADDRESS_STR
 				  " not found, ignore NL80211_TDLS_ENABLE_LINK",
 				  __func__, MAC_ADDR_ARRAY(peer));
 			return -EINVAL;
 		}
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NL80211_TDLS_ENABLE_LINK for peer "
 			  MAC_ADDRESS_STR " link_status: %d",
 			  __func__, MAC_ADDR_ARRAY(peer),
 			  pTdlsPeer->link_status);
 
 		if (!TDLS_STA_INDEX_VALID(pTdlsPeer->staId)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: invalid sta index %u for "
 				  MAC_ADDRESS_STR
 				  " TDLS_ENABLE_LINK failed", __func__,
@@ -4253,8 +4253,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 					     msecs_to_jiffies
 						     (WAIT_TIME_TDLS_LINK_ESTABLISH_REQ));
 				if (!rc) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: Link Establish Request timed out",
 						  __func__);
 					return -EINVAL;
@@ -4327,8 +4327,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 						CFG_TDLS_PREFERRED_OFF_CHANNEL_NUM_DEFAULT;
 				}
 
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Peer " MAC_ADDRESS_STR
 					  "vdevId: %d, peerState: %d, isPeerResponder: %d, uapsdQueues: 0x%x, maxSp: 0x%x, peerBuffStaSupport: %d, peerOffChanSupport: %d, peerCurrOperClass: %d, selfCurrOperClass: %d, peerChanLen: %d, peerOperClassLen: %d, prefOffChanNum: %d, prefOffChanBandwidth: %d, op_class_for_pref_off_chan: %d",
 					  __func__,
@@ -4390,8 +4390,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 								   &smeTdlsPeerStateParams);
 				if (QDF_STATUS_SUCCESS !=
 				    cdf_ret_status) {
-					CDF_TRACE(QDF_MODULE_ID_HDD,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_HDD,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: sme_update_tdls_peer_state failed for "
 						  MAC_ADDRESS_STR,
 						  __func__,
@@ -4432,15 +4432,15 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 			wlan_hdd_tdls_find_peer(pAdapter, peer, true);
 
 		if (NULL == pTdlsPeer) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: peer matching " MAC_ADDRESS_STR
 				  " not found, ignore NL80211_TDLS_DISABLE_LINK",
 				  __func__, MAC_ADDR_ARRAY(peer));
 			return -EINVAL;
 		}
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NL80211_TDLS_DISABLE_LINK for peer "
 			  MAC_ADDRESS_STR " link_status: %d",
 			  __func__, MAC_ADDR_ARRAY(peer),
@@ -4462,8 +4462,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 							 msecs_to_jiffies
 								 (WAIT_TIME_TDLS_DEL_STA));
 			if (!rc) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: Del station timed out",
 					  __func__);
 				return -EPERM;
@@ -4475,8 +4475,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 						eTDLS_LINK_UNSPECIFIED :
 						eTDLS_LINK_DROPPED_BY_REMOTE);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: TDLS Peer Station doesn't exist.",
 				  __func__);
 		}
@@ -4488,8 +4488,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 			wlan_hdd_tdls_extctrl_deconfig_peer(pAdapter, peer);
 
 		if (0 != status) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: Error in TDLS Teardown",
 				  __func__);
 			return status;
@@ -4502,8 +4502,8 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 				peer, NULL,
 				pHddCtx->config->fTDLSPrefOffChanNum, 0, 0, 0);
 		if (0 != status) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: Error in TDLS Setup", __func__);
 			return status;
 		}
@@ -4511,12 +4511,12 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 	break;
 	case NL80211_TDLS_DISCOVERY_REQ:
 		/* We don't support in-driver setup/teardown/discovery */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "%s: We don't support in-driver setup/teardown/discovery",
 			  __func__);
 		return -ENOTSUPP;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: unsupported event", __func__);
 		return -ENOTSUPP;
 	}
@@ -4566,7 +4566,7 @@ int wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
 int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy,
 					     struct net_device *dev, u8 *peer)
 {
-	hddLog(CDF_TRACE_LEVEL_INFO,
+	hddLog(QDF_TRACE_LEVEL_INFO,
 	       "tdls send discover req: " MAC_ADDRESS_STR,
 	       MAC_ADDR_ARRAY(peer));
 #if TDLS_MGMT_VERSION2
diff --git a/core/hdd/src/wlan_hdd_trace.c b/core/hdd/src/wlan_hdd_trace.c
index 41d51fb247e9..0da7f7338442 100644
--- a/core/hdd/src/wlan_hdd_trace.c
+++ b/core/hdd/src/wlan_hdd_trace.c
@@ -34,7 +34,7 @@
  *
  */
 
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "qdf_types.h"
 #include "wlan_hdd_trace.h"
 #include "wlan_hdd_main.h"
@@ -48,7 +48,7 @@
  * Return: none
  */
 static void
-hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index)
+hdd_trace_dump(void *mac, tp_qdf_trace_record record, uint16_t index)
 {
 	if (TRACE_CODE_HDD_RX_SME_MSG == record->code)
 		hddLog(LOGE, "%04d    %012llu  S%d    %-14s  %-30s(0x%x) ",
@@ -69,7 +69,7 @@ hdd_trace_dump(void *mac, tp_cdf_trace_record record, uint16_t index)
  */
 void hdd_trace_init(void)
 {
-	cdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump);
+	qdf_trace_register(QDF_MODULE_ID_HDD, hdd_trace_dump);
 }
 
 #endif /* ifdef HDD_TRACE_RECORD */
diff --git a/core/hdd/src/wlan_hdd_tx_rx.c b/core/hdd/src/wlan_hdd_tx_rx.c
index 2d67457cd3e1..749ebddee640 100644
--- a/core/hdd/src/wlan_hdd_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_tx_rx.c
@@ -313,7 +313,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	++pAdapter->hdd_stats.hddTxRxStats.txXmitCalled;
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN,
 			"Recovery in progress, dropping the packet");
 		++pAdapter->stats.tx_dropped;
 		++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
@@ -334,11 +334,11 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		    (qdf_is_macaddr_broadcast(pDestMacAddress) ||
 		     qdf_is_macaddr_group(pDestMacAddress))) {
 			STAId = pHddStaCtx->broadcast_ibss_staid;
-			CDF_TRACE(QDF_MODULE_ID_HDD_DATA,
-				  CDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet",
+			QDF_TRACE(QDF_MODULE_ID_HDD_DATA,
+				  QDF_TRACE_LEVEL_INFO_LOW, "%s: BC/MC packet",
 				  __func__);
 		} else if (STAId == HDD_WLAN_INVALID_STA_ID) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN,
 				  "%s: Received Unicast frame with invalid staID",
 				  __func__);
 			++pAdapter->stats.tx_dropped;
@@ -350,7 +350,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		if (WLAN_HDD_OCB != pAdapter->device_mode &&
 			eConnectionState_Associated !=
 				pHddStaCtx->conn_info.connState) {
-			CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO,
 				FL("Tx frame in not associated state in %d context"),
 				pAdapter->device_mode);
 			++pAdapter->stats.tx_dropped;
@@ -391,7 +391,7 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	++pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[ac];
 #ifdef HDD_WMM_DEBUG
-	CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
+	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL,
 		  "%s: Classified as ac %d up %d", __func__, ac, up);
 #endif /* HDD_WMM_DEBUG */
 
@@ -479,19 +479,19 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	NBUF_CB_TX_PACKET_TRACK(skb) = NBUF_TX_PKT_DATA_TRACK;
 	NBUF_UPDATE_TX_PKT_COUNT(skb, NBUF_TX_PKT_HDD);
 
-	cdf_dp_trace_set_track(skb);
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_PTR_RECORD,
+	qdf_dp_trace_set_track(skb);
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_PTR_RECORD,
 				(uint8_t *)skb->data, sizeof(skb->data)));
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD,
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD,
 				(uint8_t *)skb->data, cdf_nbuf_len(skb)));
-	if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE)
-		DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_HDD_PACKET_RECORD,
-				(uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE],
-				(cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE)));
+	if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
+		DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_HDD_PACKET_RECORD,
+				(uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
+				(cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE)));
 
 	if (ol_tx_send_data_frame(STAId, (cdf_nbuf_t) skb,
 							  proto_type) != NULL) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_WARN,
 			  "%s: Failed to send packet to txrx for staid:%d",
 			  __func__, STAId);
 		goto drop_pkt;
@@ -502,12 +502,12 @@ int hdd_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 drop_pkt:
 
-	DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD,
+	DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
 				(uint8_t *)skb->data, cdf_nbuf_len(skb)));
-	if (cdf_nbuf_len(skb) > CDF_DP_TRACE_RECORD_SIZE)
-		DPTRACE(cdf_dp_trace(skb, CDF_DP_TRACE_DROP_PACKET_RECORD,
-				(uint8_t *)&skb->data[CDF_DP_TRACE_RECORD_SIZE],
-				(cdf_nbuf_len(skb)-CDF_DP_TRACE_RECORD_SIZE)));
+	if (cdf_nbuf_len(skb) > QDF_DP_TRACE_RECORD_SIZE)
+		DPTRACE(qdf_dp_trace(skb, QDF_DP_TRACE_DROP_PACKET_RECORD,
+				(uint8_t *)&skb->data[QDF_DP_TRACE_RECORD_SIZE],
+				(cdf_nbuf_len(skb)-QDF_DP_TRACE_RECORD_SIZE)));
 
 	++pAdapter->stats.tx_dropped;
 	++pAdapter->hdd_stats.hddTxRxStats.txXmitDropped;
@@ -556,10 +556,10 @@ static void __hdd_tx_timeout(struct net_device *dev)
 	struct netdev_queue *txq;
 	int i = 0;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Transmission timeout occurred jiffies %lu trans_start %lu",
 		  __func__, jiffies, dev->trans_start);
-	DPTRACE(cdf_dp_trace(NULL, CDF_DP_TRACE_HDD_TX_TIMEOUT,
+	DPTRACE(qdf_dp_trace(NULL, QDF_DP_TRACE_HDD_TX_TIMEOUT,
 				NULL, 0));
 
 	/* Getting here implies we disabled the TX queues for too
@@ -571,12 +571,12 @@ static void __hdd_tx_timeout(struct net_device *dev)
 
 	for (i = 0; i < NUM_TX_QUEUES; i++) {
 		txq = netdev_get_tx_queue(dev, i);
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO,
 			  "Queue%d status: %d txq->trans_start %lu",
 			   i, netif_tx_queue_stopped(txq), txq->trans_start);
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO,
 		  "carrier state: %d", netif_carrier_ok(dev));
 }
 
@@ -609,9 +609,9 @@ QDF_STATUS hdd_init_tx_rx(hdd_adapter_t *pAdapter)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  FL("pAdapter is NULL"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -630,9 +630,9 @@ QDF_STATUS hdd_deinit_tx_rx(hdd_adapter_t *pAdapter)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  FL("pAdapter is NULL"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -666,14 +666,14 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId)
 
 	/* Sanity check on inputs */
 	if ((NULL == cds_context) || (NULL == rxBuf)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Null params being passed", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	pHddCtx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (NULL == pHddCtx) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD context is Null", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -690,7 +690,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId)
 	skb = (struct sk_buff *)rxBuf;
 
 	if (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic) {
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_FATAL,
 			  "Magic cookie(%x) for adapter sanity verification is invalid",
 			  pAdapter->magic);
 		return QDF_STATUS_E_FAILURE;
@@ -700,7 +700,7 @@ QDF_STATUS hdd_rx_packet_cbk(void *cds_context, cdf_nbuf_t rxBuf, uint8_t staId)
 	if ((pHddStaCtx->conn_info.proxyARPService) &&
 	    cfg80211_is_gratuitous_arp_unsolicited_na(skb)) {
 		++pAdapter->hdd_stats.hddTxRxStats.rxDropped[cpu_index];
-		CDF_TRACE(QDF_MODULE_ID_HDD_DATA, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO,
 			  "%s: Dropping HS 2.0 Gratuitous ARP or Unsolicited NA",
 			  __func__);
 		/* Remove SKB from internal tracking table before submitting
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index d2441109d8ff..b91a1f354bce 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -74,7 +74,7 @@
 #include "qc_sap_ioctl.h"
 #include "sme_api.h"
 #include "wma_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "wlan_hdd_assoc.h"
 #include "wlan_hdd_ioctl.h"
 #include "wlan_hdd_scan.h"
@@ -471,7 +471,7 @@ static const hdd_freq_chan_map_t freq_chan_map[] = {
 			__p += __size;					\
 			__tlen += __size + 2;				\
 		} else {						\
-			hddLog(CDF_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!");  \
+			hddLog(QDF_TRACE_LEVEL_ERROR, "FILL_TLV Failed!!!");  \
 		}							\
 	} while (0)
 
@@ -510,20 +510,20 @@ void *mem_alloc_copy_from_user_helper(const __user void *wrqu_data, size_t len)
 	 * (4096 bytes). So we use 4096 as the upper boundary for now.
 	 */
 	if (len > MAX_USER_COMMAND_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid length");
 		return NULL;
 	}
 
 	ptr = kmalloc(len + 1, GFP_KERNEL);
 	if (NULL == ptr) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "unable to allocate memory");
 		return NULL;
 	}
 
 	if (copy_from_user(ptr, wrqu_data, len)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to copy data to user buffer", __func__);
 		kfree(ptr);
 		return NULL;
@@ -738,7 +738,7 @@ void hdd_wlan_get_version(hdd_adapter_t *pAdapter, union iwreq_data *wrqu,
 
 	pHddContext = WLAN_HDD_GET_CTX(pAdapter);
 	if (!pHddContext) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s:Invalid context, HDD context is null", __func__);
 		goto error;
 	}
@@ -789,7 +789,7 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu)
 	ENTER();
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Adapter is NULL", __func__);
 		return -EINVAL;
 	}
@@ -801,14 +801,14 @@ int hdd_wlan_get_rts_threshold(hdd_adapter_t *pAdapter, union iwreq_data *wrqu)
 
 	if (QDF_STATUS_SUCCESS !=
 	    sme_cfg_get_int(hHal, WNI_CFG_RTS_THRESHOLD, &threshold)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  FL
 				  ("failed to get ini parameter, WNI_CFG_RTS_THRESHOLD"));
 		return -EIO;
 	}
 	wrqu->rts.value = threshold;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  ("Rts-Threshold=%d!!"), wrqu->rts.value);
 
 	EXIT();
@@ -836,7 +836,7 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter,
 	ENTER();
 
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Adapter is NULL", __func__);
 		return -EINVAL;
 	}
@@ -848,14 +848,14 @@ int hdd_wlan_get_frag_threshold(hdd_adapter_t *pAdapter,
 
 	if (sme_cfg_get_int(hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, &threshold)
 	    != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  FL
 				  ("failed to get ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD"));
 		return -EIO;
 	}
 	wrqu->frag.value = threshold;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  ("Frag-Threshold=%d!!"), wrqu->frag.value);
 
 	EXIT();
@@ -881,7 +881,7 @@ int hdd_wlan_get_freq(uint32_t channel, uint32_t *pfreq)
 			}
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  ("Invalid channel no=%d!!"), channel);
 	return -EINVAL;
 }
@@ -969,7 +969,7 @@ static void hdd_get_rssi_cb(int8_t rssi, uint32_t staId, void *pContext)
 	}
 
 	if (NULL == pContext) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, pContext [%p]", __func__, pContext);
 		return;
 	}
@@ -990,7 +990,7 @@ static void hdd_get_rssi_cb(int8_t rssi, uint32_t staId, void *pContext)
 		 * we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter [%p] magic [%08x]",
 		       __func__, pAdapter, pStatsContext->magic);
 		if (ioctl_debug) {
@@ -1038,7 +1038,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext)
 	}
 
 	if (NULL == pContext) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, pContext [%p]", __func__, pContext);
 		return;
 	}
@@ -1058,7 +1058,7 @@ static void hdd_get_snr_cb(int8_t snr, uint32_t staId, void *pContext)
 		 * we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter [%p] magic [%08x]",
 		       __func__, pAdapter, pStatsContext->magic);
 		if (ioctl_debug) {
@@ -1099,7 +1099,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value)
 	unsigned long rc;
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1135,7 +1135,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value)
 			       pHddStaCtx->conn_info.bssId, pAdapter->rssi,
 			       &context, pHddCtx->pcds_context);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI",
 		       __func__);
 		/* we'll returned a cached value below */
 	} else {
@@ -1144,7 +1144,7 @@ QDF_STATUS wlan_hdd_get_rssi(hdd_adapter_t *pAdapter, int8_t *rssi_value)
 						 msecs_to_jiffies
 							 (WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("SME timed out while retrieving RSSI"));
 			/* we'll now returned a cached value below */
 		}
@@ -1191,7 +1191,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr)
 	ENTER();
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Invalid context, pAdapter", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1212,7 +1212,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr)
 			      pHddStaCtx->conn_info.staId[0],
 			      pHddStaCtx->conn_info.bssId, &context);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI",
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: Unable to retrieve RSSI",
 		       __func__);
 		/* we'll returned a cached value below */
 	} else {
@@ -1221,7 +1221,7 @@ QDF_STATUS wlan_hdd_get_snr(hdd_adapter_t *pAdapter, int8_t *snr)
 						 msecs_to_jiffies
 							 (WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("SME timed out while retrieving SNR"));
 			/* we'll now returned a cached value below */
 		}
@@ -1272,7 +1272,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext)
 	hdd_adapter_t *pAdapter;
 
 	if ((NULL == pLinkSpeed) || (NULL == pContext)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, pLinkSpeed [%p] pContext [%p]",
 		       __func__, pLinkSpeed, pContext);
 		return;
@@ -1293,7 +1293,7 @@ hdd_get_link_speed_cb(tSirLinkSpeedInfo *pLinkSpeed, void *pContext)
 		 * we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter [%p] magic [%08x]",
 		       __func__, pAdapter, pLinkSpeedContext->magic);
 		if (ioctl_debug) {
@@ -1337,12 +1337,12 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
 	tSirLinkSpeedInfo *linkspeed_req;
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	linkspeed_req = cdf_mem_malloc(sizeof(*linkspeed_req));
 	if (NULL == linkspeed_req) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s Request Buffer Alloc Fail", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -1355,7 +1355,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
 				    linkspeed_req,
 				    &context, hdd_get_link_speed_cb);
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Unable to retrieve statistics for link speed",
 		       __func__);
 		cdf_mem_free(linkspeed_req);
@@ -1364,7 +1364,7 @@ QDF_STATUS wlan_hdd_get_linkspeed_for_peermac(hdd_adapter_t *pAdapter,
 			(&context.completion,
 			 msecs_to_jiffies(WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: SME timed out while retrieving link speed",
 			       __func__);
 		}
@@ -1586,7 +1586,7 @@ uint8_t *wlan_hdd_get_vendor_oui_ie_ptr(uint8_t *oui, uint8_t oui_size,
 		elem_len = ptr[1];
 		left -= 2;
 		if (elem_len > left) {
-			hddLog(CDF_TRACE_LEVEL_FATAL,
+			hddLog(QDF_TRACE_LEVEL_FATAL,
 			       FL
 				       ("****Invalid IEs eid = %d elem_len=%d left=%d*****"),
 			       eid, elem_len, left);
@@ -1786,7 +1786,7 @@ static int __iw_set_mode(struct net_device *dev,
 								 msecs_to_jiffies
 									 (WLAN_WAIT_TIME_DISCONNECT));
 				if (!rc)
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       FL
 						       ("failed wait on disconnect_comp_var"));
 			}
@@ -1962,7 +1962,7 @@ static int __iw_set_freq(struct net_device *dev, struct iw_request_info *info,
 		if (sme_cfg_get_str(hHal, WNI_CFG_VALID_CHANNEL_LIST,
 				    validChan, &numChans) !=
 				QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, FL
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, FL
 				  ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST"));
 			return -EIO;
 		}
@@ -2051,7 +2051,7 @@ static int __iw_get_freq(struct net_device *dev, struct iw_request_info *info,
 	if (pHddStaCtx->conn_info.connState == eConnectionState_Associated) {
 		if (sme_get_operation_channel(hHal, &channel, pAdapter->sessionId)
 		    != QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  FL("failed to get operating channel %u"),
 				  pAdapter->sessionId);
 			return -EIO;
@@ -2182,7 +2182,7 @@ static int __iw_set_tx_power(struct net_device *dev,
 
 	if (sme_cfg_set_int(hHal, WNI_CFG_CURRENT_TX_POWER_LEVEL,
 				wrqu->txpower.value) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL
 				("failed to set ini parameter, WNI_CFG_CURRENT_TX_POWER_LEVEL"));
 		return -EIO;
 	}
@@ -2266,7 +2266,7 @@ static int __iw_get_bitrate(struct net_device *dev,
 					   pAdapter, pAdapter->sessionId);
 
 		if (QDF_STATUS_SUCCESS != status) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Unable to retrieve statistics", __func__);
 			return status;
 		}
@@ -2278,7 +2278,7 @@ static int __iw_get_bitrate(struct net_device *dev,
 					      WLAN_WAIT_TIME_STATS);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: SME timeout while retrieving statistics",
 			       __func__);
 			return QDF_STATUS_E_FAILURE;
@@ -2390,7 +2390,7 @@ static int __iw_set_bitrate(struct net_device *dev,
 	}
 	if (sme_cfg_set_int(WLAN_HDD_GET_HAL_CTX(pAdapter),
 			    WNI_CFG_FIXED_RATE, rate) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL
 				("failed to set ini parameter, WNI_CFG_FIXED_RATE"));
 		return -EIO;
 	}
@@ -2456,7 +2456,7 @@ static int __iw_set_genie(struct net_device *dev,
 	base_genie = mem_alloc_copy_from_user_helper(wrqu->data.pointer,
 						     wrqu->data.length);
 	if (NULL == base_genie) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "mem_alloc_copy_from_user_helper fail");
 		return -ENOMEM;
 	}
@@ -2478,7 +2478,7 @@ static int __iw_set_genie(struct net_device *dev,
 		eLen = *genie++;
 		remLen -= 2;
 
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]",
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s: IE[0x%X], LEN[%d]",
 		       __func__, elementId, eLen);
 
 		switch (elementId) {
@@ -2490,17 +2490,17 @@ static int __iw_set_genie(struct net_device *dev,
 
 			if (0 == memcmp(&genie[0], "\x00\x50\xf2\x04", 4)) {
 				uint16_t curGenIELen = pWextState->genIE.length;
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "%s Set WPS OUI(%02x %02x %02x %02x) IE(len %d)",
 				       __func__, genie[0], genie[1], genie[2],
 				       genie[3], eLen + 2);
 
 				if (SIR_MAC_MAX_IE_LENGTH <
 				    (pWextState->genIE.length + eLen)) {
-					hddLog(CDF_TRACE_LEVEL_FATAL,
+					hddLog(QDF_TRACE_LEVEL_FATAL,
 					       "Cannot accommodate genIE. "
 					       "Need bigger buffer space");
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					kfree(base_genie);
 					return -ENOMEM;
 				}
@@ -2509,7 +2509,7 @@ static int __iw_set_genie(struct net_device *dev,
 				       curGenIELen, genie - 2, eLen + 2);
 				pWextState->genIE.length += eLen + 2;
 			} else if (0 == memcmp(&genie[0], "\x00\x50\xf2", 3)) {
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "%s Set WPA IE (len %d)", __func__,
 				       eLen + 2);
 				memset(pWextState->WPARSNIE, 0,
@@ -2523,17 +2523,17 @@ static int __iw_set_genie(struct net_device *dev,
 			} else {        /* any vendorId except WPA IE should be accumulated to genIE */
 
 				uint16_t curGenIELen = pWextState->genIE.length;
-				hddLog(CDF_TRACE_LEVEL_INFO,
+				hddLog(QDF_TRACE_LEVEL_INFO,
 				       "%s Set OUI(%02x %02x %02x %02x) IE(len %d)",
 				       __func__, genie[0], genie[1], genie[2],
 				       genie[3], eLen + 2);
 
 				if (SIR_MAC_MAX_IE_LENGTH <
 				    (pWextState->genIE.length + eLen)) {
-					hddLog(CDF_TRACE_LEVEL_FATAL,
+					hddLog(QDF_TRACE_LEVEL_FATAL,
 					       "Cannot accommodate genIE. "
 					       "Need bigger buffer space");
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					kfree(base_genie);
 					return -ENOMEM;
 				}
@@ -2825,7 +2825,7 @@ static int __iw_set_rts_threshold(struct net_device *dev,
 
 	if (sme_cfg_set_int(hHal, WNI_CFG_RTS_THRESHOLD, wrqu->rts.value) !=
 			QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL
 				("failed to set ini parameter, WNI_CFG_RTS_THRESHOLD"));
 		return -EIO;
 	}
@@ -2955,7 +2955,7 @@ static int __iw_set_frag_threshold(struct net_device *dev,
 	if (sme_cfg_set_int
 		    (hHal, WNI_CFG_FRAGMENTATION_THRESHOLD, wrqu->frag.value)
 		    != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR, FL
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, FL
 				("failed to set ini parameter, WNI_CFG_FRAGMENTATION_THRESHOLD"));
 		return -EIO;
 	}
@@ -3129,7 +3129,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info,
 	if (sme_cfg_get_int(hHal,
 			    WNI_CFG_DOT11_MODE,
 			    &active_phy_mode) == QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "active_phy_mode = %d", active_phy_mode);
 
 		if (active_phy_mode == WNI_CFG_DOT11_MODE_11A
@@ -3191,7 +3191,7 @@ static int __iw_get_range(struct net_device *dev, struct iw_request_info *info,
 	if (sme_cfg_get_str
 		    ((hHal), WNI_CFG_VALID_CHANNEL_LIST, channels,
 		    &num_channels) != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  FL
 				  ("failed to get ini parameter, WNI_CFG_VALID_CHANNEL_LIST"));
 		return -EIO;
@@ -3281,7 +3281,7 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext)
 	}
 
 	if ((NULL == pStats) || (NULL == pContext)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, pStats [%p] pContext [%p]",
 		       __func__, pStats, pContext);
 		return;
@@ -3304,7 +3304,7 @@ static void hdd_get_class_a_statistics_cb(void *pStats, void *pContext)
 		 * we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter [%p] magic [%08x]",
 		       __func__, pAdapter, pStatsContext->magic);
 		if (ioctl_debug) {
@@ -3343,7 +3343,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter)
 	struct statsContext context;
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	if (cds_is_driver_recovering()) {
@@ -3365,7 +3365,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter)
 				     pHddStaCtx->conn_info.staId[0],
 				     &context, pAdapter->sessionId);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Unable to retrieve Class A statistics", __func__);
 		/* we'll returned a cached value below */
 	} else {
@@ -3374,7 +3374,7 @@ QDF_STATUS wlan_hdd_get_class_astats(hdd_adapter_t *pAdapter)
 			(&context.completion,
 			 msecs_to_jiffies(WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("SME timed out while retrieving Class A statistics"));
 		}
 	}
@@ -3420,7 +3420,7 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext)
 	}
 
 	if ((NULL == pStats) || (NULL == pContext)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Bad param, pStats [%p] pContext [%p]",
 		       __func__, pStats, pContext);
 		return;
@@ -3443,7 +3443,7 @@ static void hdd_get_station_statistics_cb(void *pStats, void *pContext)
 		 * we can do
 		 */
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Invalid context, pAdapter [%p] magic [%08x]",
 		       __func__, pAdapter, pStatsContext->magic);
 		if (ioctl_debug) {
@@ -3483,7 +3483,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter)
 	struct statsContext context;
 
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
+		hddLog(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter is NULL", __func__);
 		return QDF_STATUS_SUCCESS;
 	}
 
@@ -3503,7 +3503,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter)
 				     pHddStaCtx->conn_info.staId[0],
 				     &context, pAdapter->sessionId);
 	if (QDF_STATUS_SUCCESS != hstatus) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Unable to retrieve statistics", __func__);
 		/* we'll return with cached values */
 	} else {
@@ -3513,7 +3513,7 @@ QDF_STATUS wlan_hdd_get_station_stats(hdd_adapter_t *pAdapter)
 			 msecs_to_jiffies(WLAN_WAIT_TIME_STATS));
 
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL("SME timed out while retrieving statistics"));
 		}
 	}
@@ -3576,7 +3576,7 @@ static int __iw_get_linkspeed(struct net_device *dev,
 	rc = snprintf(pLinkSpeed, len, "%u", link_speed);
 	if ((rc < 0) || (rc >= len)) {
 		/* encoding or length error? */
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Unable to encode link speed"));
 		return -EIO;
 	}
@@ -3771,7 +3771,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	if (wrqu->data.flags & IW_ENCODE_DISABLED) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "****iwconfig wlan0 key off*****");
 		if (!fKeyPresent) {
 
@@ -3806,7 +3806,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 								 msecs_to_jiffies
 									 (WLAN_WAIT_TIME_DISCONNECT));
 				if (!rc)
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       FL
 						       ("failed wait on disconnect_comp_var"));
 			}
@@ -3817,7 +3817,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	if (wrqu->data.flags & (IW_ENCODE_OPEN | IW_ENCODE_RESTRICTED)) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "iwconfig wlan0 key on");
+		hddLog(QDF_TRACE_LEVEL_INFO, "iwconfig wlan0 key on");
 
 		pHddStaCtx->conn_info.authType =
 			(encoderq->
@@ -3827,7 +3827,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 	}
 
 	if (wrqu->data.length > 0) {
-		hddLog(CDF_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d",
+		hddLog(QDF_TRACE_LEVEL_INFO, "%s : wrqu->data.length : %d",
 		       __func__, wrqu->data.length);
 
 		key_length = wrqu->data.length;
@@ -3835,7 +3835,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 		/* IW_ENCODING_TOKEN_MAX is the value that is set for wrqu->data.length by iwconfig.c when 'iwconfig wlan0 key on' is issued. */
 
 		if (5 == key_length) {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       "%s: Call with WEP40,key_len=%d", __func__,
 			       key_length);
 
@@ -3848,7 +3848,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 					eCSR_ENCRYPT_TYPE_WEP40_STATICKEY;
 			}
 		} else if (13 == key_length) {
-			hddLog(CDF_TRACE_LEVEL_INFO,
+			hddLog(QDF_TRACE_LEVEL_INFO,
 			       "%s:Call with WEP104,key_len:%d", __func__,
 			       key_length);
 
@@ -3861,7 +3861,7 @@ static int __iw_set_encode(struct net_device *dev, struct iw_request_info *info,
 					eCSR_ENCRYPT_TYPE_WEP104_STATICKEY;
 			}
 		} else {
-			hddLog(CDF_TRACE_LEVEL_WARN,
+			hddLog(QDF_TRACE_LEVEL_WARN,
 			       "%s: Invalid WEP key length :%d", __func__,
 			       key_length);
 			return -EINVAL;
@@ -4071,7 +4071,7 @@ static int __iw_set_encodeext(struct net_device *dev,
 	    (IW_ENCODE_ALG_WEP == ext->alg)) {
 		if (IW_AUTH_KEY_MGMT_802_1X == pWextState->authKeyMgmt) {
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  ("Invalid Configuration:%s"), __func__);
 			return -EINVAL;
 		} else {
@@ -4179,7 +4179,7 @@ static int __iw_set_encodeext(struct net_device *dev,
 		break;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  ("%s:cipher_alg:%d key_len[%d] *pEncryptionType :%d"),
 		  __func__, (int)ext->alg, (int)ext->key_len, setKey.encType);
 
@@ -4190,11 +4190,11 @@ static int __iw_set_encodeext(struct net_device *dev,
 	cdf_ret_status = sme_ft_update_key(WLAN_HDD_GET_HAL_CTX(pAdapter),
 					   pAdapter->sessionId, &setKey);
 	if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_SUCCESS) {
-		hddLog(CDF_TRACE_LEVEL_INFO_MED,
+		hddLog(QDF_TRACE_LEVEL_INFO_MED,
 		       "%s: Update PreAuth Key success", __func__);
 		return 0;
 	} else if (cdf_ret_status == QDF_STATUS_FT_PREAUTH_KEY_FAILED) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Update PreAuth Key failed", __func__);
 		return -EINVAL;
 	}
@@ -4206,7 +4206,7 @@ static int __iw_set_encodeext(struct net_device *dev,
 					  &setKey, &roamId);
 
 	if (cdf_ret_status != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "[%4d] sme_roam_set_key returned ERROR status= %d",
 			  __LINE__, cdf_ret_status);
 
@@ -4265,7 +4265,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info,
 	if (wrqu->retry.value < WNI_CFG_LONG_RETRY_LIMIT_STAMIN ||
 	    wrqu->retry.value > WNI_CFG_LONG_RETRY_LIMIT_STAMAX) {
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("Invalid Retry-Limit=%d!!"), wrqu->retry.value);
 
 		return -EINVAL;
@@ -4277,8 +4277,8 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info,
 			if (sme_cfg_set_int (hHal, WNI_CFG_LONG_RETRY_LIMIT,
 						wrqu->retry.value) !=
 					QDF_STATUS_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR, FL
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR, FL
 					  ("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
 				return -EIO;
 			}
@@ -4286,8 +4286,8 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info,
 			if (sme_cfg_set_int (hHal, WNI_CFG_SHORT_RETRY_LIMIT,
 						wrqu->retry.value) !=
 					QDF_STATUS_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					CDF_TRACE_LEVEL_ERROR, FL
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					QDF_TRACE_LEVEL_ERROR, FL
 					("failed to set ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
 				return -EIO;
 			}
@@ -4296,7 +4296,7 @@ static int __iw_set_retry(struct net_device *dev, struct iw_request_info *info,
 		return -EOPNOTSUPP;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  ("Set Retry-Limit=%d!!"), wrqu->retry.value);
 
 	EXIT();
@@ -4356,7 +4356,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info,
 
 		if (sme_cfg_get_int(hHal, WNI_CFG_LONG_RETRY_LIMIT, &retry) !=
 		    QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 				  FL
 					  ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
 			return -EIO;
@@ -4368,7 +4368,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info,
 
 		if (sme_cfg_get_int(hHal, WNI_CFG_SHORT_RETRY_LIMIT, &retry) !=
 		    QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 				  FL
 					  ("failed to get ini parameter, WNI_CFG_LONG_RETRY_LIMIT"));
 			return -EIO;
@@ -4379,7 +4379,7 @@ static int __iw_get_retry(struct net_device *dev, struct iw_request_info *info,
 		return -EOPNOTSUPP;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"),
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, ("Retry-Limit=%d!!"),
 		  retry);
 
 	EXIT();
@@ -4462,7 +4462,7 @@ static int __iw_set_mlme(struct net_device *dev,
 								 msecs_to_jiffies
 									 (WLAN_WAIT_TIME_DISCONNECT));
 				if (!rc)
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       FL
 						       ("failed wait on disconnect_comp_var"));
 			} else
@@ -4573,7 +4573,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 	}
 
 	vhtchanwidth = phddctx->config->vhtChannelWidth;
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN, ("ch_bond24=%d "
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN, ("ch_bond24=%d "
 		"ch_bond5g=%d band_24=%d band_5g=%d VHT_ch_width=%u"),
 		ch_bond24, ch_bond5g, band_24, band_5g, vhtchanwidth);
 
@@ -4808,7 +4808,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			smeconfig.csrConfig.channelBondingMode5GHz;
 		phddctx->config->vhtChannelWidth = vhtchanwidth;
 		if (hdd_update_config_dat(phddctx) == false) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: could not update config_dat", __func__);
 			return -EIO;
 		}
@@ -4819,7 +4819,7 @@ int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal,
 			phddctx->wiphy->bands[IEEE80211_BAND_5GHZ]->ht_cap.cap
 				&= ~IEEE80211_HT_CAP_SUP_WIDTH_20_40;
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			"New_Phymode= %d ch_bonding=%d band=%d VHT_ch_width=%u",
 			phymode, chwidth, curr_band, vhtchanwidth);
 	}
@@ -4844,7 +4844,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext)
 	hdd_adapter_t *pAdapter;
 	ENTER();
 	if (NULL == pContext) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("pContext is NULL"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("pContext is NULL"));
 		return;
 	}
 	pTempContext = pContext;
@@ -4852,7 +4852,7 @@ static void hdd_get_temperature_cb(int temperature, void *pContext)
 	spin_lock(&hdd_context_lock);
 	if ((NULL == pAdapter) || (TEMP_CONTEXT_MAGIC != pTempContext->magic)) {
 		spin_unlock(&hdd_context_lock);
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       FL("Invalid context, pAdapter [%p] magic [%08x]"),
 		       pAdapter, pTempContext->magic);
 		return;
@@ -4882,7 +4882,7 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature)
 
 	ENTER();
 	if (NULL == pAdapter) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL"));
+		hddLog(QDF_TRACE_LEVEL_ERROR, FL("pAdapter is NULL"));
 		return -EPERM;
 	}
 	init_completion(&tempContext.completion);
@@ -4891,14 +4891,14 @@ int wlan_hdd_get_temperature(hdd_adapter_t *pAdapter, int *temperature)
 	status = sme_get_temperature(WLAN_HDD_GET_HAL_CTX(pAdapter),
 				     &tempContext, hdd_get_temperature_cb);
 	if (QDF_STATUS_SUCCESS != status) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       FL("Unable to retrieve temperature"));
 	} else {
 		rc = wait_for_completion_timeout(&tempContext.completion,
 						 msecs_to_jiffies
 							 (WLAN_WAIT_TIME_STATS));
 		if (!rc) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       FL
 				       ("SME timed out while retrieving temperature"));
 		}
@@ -4957,8 +4957,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 			smeConfig.csrConfig.Is11dSupportEnabled =
 				(bool) set_value;
 
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_INFO,
 				  ("11D state=%d!!"),
 				  smeConfig.csrConfig.
 				  Is11dSupportEnabled);
@@ -5033,8 +5033,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		} else if (sme_cfg_set_int(hHal, WNI_CFG_ASSOC_STA_LIMIT,
 					set_value)
 			   != QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR, FL
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR, FL
 				  ("failed to set ini parameter, WNI_CFG_ASSOC_STA_LIMIT"));
 			ret = -EIO;
 		}
@@ -5077,7 +5077,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 			    (hHal, pAdapter->sessionId, bssid,
 			    pAdapter->device_mode,
 			    set_value) != QDF_STATUS_SUCCESS) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Setting tx power failed", __func__);
 			return -EIO;
 		}
@@ -5088,7 +5088,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 		struct qdf_mac_addr bssid;
 		struct qdf_mac_addr selfMac;
 
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "%s: Setting maximum tx power %d dBm", __func__,
 		       set_value);
 		qdf_copy_macaddr(&bssid, &pHddStaCtx->conn_info.bssId);
@@ -5096,7 +5096,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 
 		if (sme_set_max_tx_power(hHal, bssid, selfMac, set_value)
 		    != QDF_STATUS_SUCCESS) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Setting maximum tx power failed",
 			       __func__);
 			return -EIO;
@@ -5106,12 +5106,12 @@ static int __iw_setint_getnone(struct net_device *dev,
 	}
 	case WE_SET_MAX_TX_POWER_2_4:
 	{
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "%s: Setting maximum tx power %d dBm for 2.4 GHz band",
 		       __func__, set_value);
 		if (sme_set_max_tx_power_per_band(eCSR_BAND_24, set_value) !=
 		    QDF_STATUS_SUCCESS) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Setting maximum tx power failed for 2.4 GHz band",
 			       __func__);
 			return -EIO;
@@ -5121,12 +5121,12 @@ static int __iw_setint_getnone(struct net_device *dev,
 	}
 	case WE_SET_MAX_TX_POWER_5_0:
 	{
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "%s: Setting maximum tx power %d dBm for 5.0 GHz band",
 		       __func__, set_value);
 		if (sme_set_max_tx_power_per_band(eCSR_BAND_5G, set_value) !=
 		    QDF_STATUS_SUCCESS) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Setting maximum tx power failed for 5.0 GHz band",
 			       __func__);
 			return -EIO;
@@ -5156,7 +5156,7 @@ static int __iw_setint_getnone(struct net_device *dev,
 
 	case WE_SET_TM_LEVEL:
 	{
-		hddLog(CDF_TRACE_LEVEL_INFO,
+		hddLog(QDF_TRACE_LEVEL_INFO,
 		       "Set Thermal Mitigation Level %d", set_value);
 		(void)sme_set_thermal_level(hHal, set_value);
 		break;
@@ -5273,8 +5273,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		/* get the HT capability info */
 		ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
 		if (QDF_STATUS_SUCCESS != ret) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: could not get HT capability info",
 				  __func__);
 			return -EIO;
@@ -5292,8 +5292,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		}
 
 		if (ret)
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "Failed to set LDPC value");
 
 		break;
@@ -5311,8 +5311,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		/* get the HT capability info */
 		ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
 		if (QDF_STATUS_SUCCESS != ret) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: could not get HT capability info",
 				  __func__);
 			return -EIO;
@@ -5329,8 +5329,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		}
 
 		if (ret)
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "Failed to set TX STBC value");
 
 		break;
@@ -5349,8 +5349,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		/* get the HT capability info */
 		ret = sme_cfg_get_int(hHal, WNI_CFG_HT_CAP_INFO, &value);
 		if (QDF_STATUS_SUCCESS != ret) {
-			CDF_TRACE(QDF_MODULE_ID_QDF,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_QDF,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "%s: could not get HT capability info",
 				  __func__);
 			return -EIO;
@@ -5369,8 +5369,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 		}
 
 		if (ret)
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "Failed to set RX STBC value");
 		break;
 	}
@@ -5382,8 +5382,8 @@ static int __iw_setint_getnone(struct net_device *dev,
 					   WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
 					   set_value);
 		if (ret)
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  "Failed to set ShortGI value");
 		break;
 	}
@@ -6185,7 +6185,7 @@ static int __iw_setchar_getnone(struct net_device *dev,
 	struct iw_point s_priv_data;
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 		FL("permission check failed"));
 		return -EPERM;
 	}
@@ -6212,23 +6212,23 @@ static int __iw_setchar_getnone(struct net_device *dev,
 	pBuffer = mem_alloc_copy_from_user_helper(s_priv_data.pointer,
 						  s_priv_data.length);
 	if (NULL == pBuffer) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "mem_alloc_copy_from_user_helper fail");
 		return -ENOMEM;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received length %d", __func__, s_priv_data.length);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Received data %s", __func__, pBuffer);
 
 	switch (sub_cmd) {
 	case WE_WOWL_ADD_PTRN:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "ADD_PTRN");
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "ADD_PTRN");
 		hdd_add_wowl_ptrn(pAdapter, pBuffer);
 		break;
 	case WE_WOWL_DEL_PTRN:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "DEL_PTRN");
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "DEL_PTRN");
 		hdd_del_wowl_ptrn(pAdapter, pBuffer);
 		break;
 #if defined WLAN_FEATURE_VOWIFI
@@ -6238,8 +6238,8 @@ static int __iw_setchar_getnone(struct net_device *dev,
 		tRrmNeighborRspCallbackInfo callbackInfo;
 
 		if (pConfig->fRrmEnable) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_INFO,
 				  "Neighbor Request");
 			neighborReq.no_ssid =
 				(s_priv_data.length - 1) ? false : true;
@@ -6340,20 +6340,20 @@ static int __iw_setnone_getint(struct net_device *dev,
 
 		*value = smeConfig.csrConfig.Is11dSupportEnabled;
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  ("11D state=%d!!"), *value);
 
 		break;
 	}
 
 	case WE_IBSS_STATUS:
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "****Return IBSS Status*****");
 		break;
 
 	case WE_GET_WLAN_DBG:
 	{
-		cdf_trace_display();
+		qdf_trace_display();
 		*value = 0;
 		break;
 	}
@@ -6362,8 +6362,8 @@ static int __iw_setnone_getint(struct net_device *dev,
 		if (sme_cfg_get_int
 			    (hHal, WNI_CFG_ASSOC_STA_LIMIT,
 			    (uint32_t *) value) != QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_WARN, FL
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_WARN, FL
 					  ("failed to get ini parameter, WNI_CFG_ASSOC_STA_LIMIT"));
 			ret = -EIO;
 		}
@@ -6378,7 +6378,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 	{
 		*value = cds_get_concurrency_mode();
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  ("concurrency mode=%d"), *value);
 		break;
 	}
@@ -6783,7 +6783,7 @@ static int __iw_setnone_getint(struct net_device *dev,
 
 	case WE_GET_TEMPERATURE:
 	{
-		hddLog(CDF_TRACE_LEVEL_INFO, "WE_GET_TEMPERATURE");
+		hddLog(QDF_TRACE_LEVEL_INFO, "WE_GET_TEMPERATURE");
 		ret = wlan_hdd_get_temperature(pAdapter, value);
 		break;
 	}
@@ -6839,10 +6839,10 @@ static int __iw_set_three_ints_getnone(struct net_device *dev,
 	switch (sub_cmd) {
 
 	case WE_SET_WLAN_DBG:
-		cdf_trace_set_value(value[1], value[2], value[3]);
+		qdf_trace_set_value(value[1], value[2], value[3]);
 		break;
 	case WE_SET_DP_TRACE:
-		cdf_dp_trace_set_value(value[1], value[2], value[3]);
+		qdf_dp_trace_set_value(value[1], value[2], value[3]);
 		break;
 
 	/* value[3] the acs band is not required as start and end channels are
@@ -7118,7 +7118,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 
 	case WE_GET_CFG:
 	{
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Printing CLD global INI Config",
 			  __func__);
 		hdd_cfg_get_global_config(WLAN_HDD_GET_CTX(pAdapter),
@@ -7293,8 +7293,8 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		phymode = sme_get_phy_mode(hal);
 		if ((QDF_STATUS_SUCCESS !=
 		     sme_get_freq_band(hal, &currBand))) {
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_INFO,
 				  "%s: Failed to get current band config",
 				  __func__);
 			return -EIO;
@@ -7662,7 +7662,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 	{
 		hddLog(LOG1, "%s: SELECTIVE_MODULE_LOG %d arg1 %d arg2",
 		       __func__, apps_args[0], apps_args[1]);
-		cdf_trace_enable(apps_args[0], apps_args[1]);
+		qdf_trace_enable(apps_args[0], apps_args[1]);
 	}
 	break;
 
@@ -7672,7 +7672,7 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		       "%s: MTRACE_DUMP code %d session %d count %d "
 		       "bitmask_of_module %d ", __func__, apps_args[0],
 		       apps_args[1], apps_args[2], apps_args[3]);
-		cdf_trace_dump_all((void *)hHal, apps_args[0],
+		qdf_trace_dump_all((void *)hHal, apps_args[0],
 				   apps_args[1], apps_args[2],
 				   apps_args[3]);
 
@@ -7921,8 +7921,8 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		if (QDF_STATUS_SUCCESS !=
 		    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
 			cdf_mem_free(unitTestArgs);
-			CDF_TRACE(QDF_MODULE_ID_HDD,
-				  CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
+				  QDF_TRACE_LEVEL_ERROR,
 				  FL
 					  ("Not able to post UNIT_TEST_CMD message to WMA"));
 			return -EINVAL;
@@ -7981,7 +7981,7 @@ static int iw_hdd_set_var_ints_getnone(struct net_device *dev,
 	int ret, num_args;
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -8148,11 +8148,11 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info,
 	}
 	tSpec.ts_info.up = params[HDD_WLAN_WMM_PARAM_USER_PRIORITY];
 	if (0 > tSpec.ts_info.up || SME_QOS_WMM_UP_MAX < tSpec.ts_info.up) {
-		hddLog(CDF_TRACE_LEVEL_ERROR, "***ts_info.up out of bounds***");
+		hddLog(QDF_TRACE_LEVEL_ERROR, "***ts_info.up out of bounds***");
 		return 0;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s:TS_INFO PSB %d UP %d !!!", __func__,
 		  tSpec.ts_info.psb, tSpec.ts_info.up);
 
@@ -8425,7 +8425,7 @@ static int __iw_set_host_offload(struct net_device *dev,
 		return ret;
 
 	if (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 			  "%s:LOGP dev is not in CONNECTED state, ignore!!!",
 			  __func__);
 		return -EINVAL;
@@ -8434,17 +8434,17 @@ static int __iw_set_host_offload(struct net_device *dev,
 	/* Debug display of request components. */
 	switch (pRequest->offloadType) {
 	case WLAN_IPV4_ARP_REPLY_OFFLOAD:
-		hddLog(CDF_TRACE_LEVEL_WARN,
+		hddLog(QDF_TRACE_LEVEL_WARN,
 		       "%s: Host offload request: ARP reply", __func__);
 		switch (pRequest->enableOrDisable) {
 		case WLAN_OFFLOAD_DISABLE:
-			hddLog(CDF_TRACE_LEVEL_WARN, "   disable");
+			hddLog(QDF_TRACE_LEVEL_WARN, "   disable");
 			break;
 		case WLAN_OFFLOAD_ARP_AND_BC_FILTER_ENABLE:
-			hddLog(CDF_TRACE_LEVEL_WARN, "   BC Filtering enable");
+			hddLog(QDF_TRACE_LEVEL_WARN, "   BC Filtering enable");
 		case WLAN_OFFLOAD_ENABLE:
-			hddLog(CDF_TRACE_LEVEL_WARN, "   ARP offload enable");
-			hddLog(CDF_TRACE_LEVEL_WARN,
+			hddLog(QDF_TRACE_LEVEL_WARN, "   ARP offload enable");
+			hddLog(QDF_TRACE_LEVEL_WARN,
 			       "   IP address: %d.%d.%d.%d",
 			       pRequest->params.hostIpv4Addr[0],
 			       pRequest->params.hostIpv4Addr[1],
@@ -8454,16 +8454,16 @@ static int __iw_set_host_offload(struct net_device *dev,
 		break;
 
 	case WLAN_IPV6_NEIGHBOR_DISCOVERY_OFFLOAD:
-		hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+		hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 		       "%s: Host offload request: neighbor discovery",
 		       __func__);
 		switch (pRequest->enableOrDisable) {
 		case WLAN_OFFLOAD_DISABLE:
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH, "   disable");
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "   disable");
 			break;
 		case WLAN_OFFLOAD_ENABLE:
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH, "   enable");
-			hddLog(CDF_TRACE_LEVEL_INFO_HIGH,
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH, "   enable");
+			hddLog(QDF_TRACE_LEVEL_INFO_HIGH,
 			       "   IP address: %x:%x:%x:%x:%x:%x:%x:%x",
 			       *(uint16_t *) (pRequest->params.hostIpv6Addr),
 			       *(uint16_t *) (pRequest->params.hostIpv6Addr +
@@ -8493,7 +8493,7 @@ static int __iw_set_host_offload(struct net_device *dev,
 	if (QDF_STATUS_SUCCESS !=
 	    sme_set_host_offload(WLAN_HDD_GET_HAL_CTX(pAdapter),
 				 pAdapter->sessionId, &offloadRequest)) {
-		hddLog(CDF_TRACE_LEVEL_ERROR,
+		hddLog(QDF_TRACE_LEVEL_ERROR,
 		       "%s: Failure to execute host offload request", __func__);
 		return -EINVAL;
 	}
@@ -8745,7 +8745,7 @@ static int __iw_set_packet_filter_params(struct net_device *dev,
 	struct pkt_filter_cfg *request = NULL;
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -8848,7 +8848,7 @@ static int __iw_get_statistics(struct net_device *dev,
 					    pAdapter, pAdapter->sessionId);
 
 		if (QDF_STATUS_SUCCESS != status) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: Unable to retrieve SME statistics",
 			       __func__);
 			return -EINVAL;
@@ -8860,7 +8860,7 @@ static int __iw_get_statistics(struct net_device *dev,
 			qdf_wait_single_event(&pWextState->hdd_cdf_event,
 					      WLAN_WAIT_TIME_STATS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hddLog(CDF_TRACE_LEVEL_ERROR,
+			hddLog(QDF_TRACE_LEVEL_ERROR,
 			       "%s: SME timeout while retrieving statistics",
 			       __func__);
 			/*Remove the SME statistics list by passing NULL in callback argument */
@@ -8992,7 +8992,7 @@ void found_pref_network_cb(void *callbackContext,
 	union iwreq_data wrqu;
 	char buf[MAX_PNO_NOTIFY_LEN + 1];
 
-	hddLog(CDF_TRACE_LEVEL_WARN,
+	hddLog(QDF_TRACE_LEVEL_WARN,
 	       "A preferred network was found: %s with rssi: -%d",
 	       pPrefNetworkFoundInd->ssId.ssId, pPrefNetworkFoundInd->rssi);
 
@@ -9282,19 +9282,19 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 		band = eCSR_BAND_MAX;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: change band to %u", __func__, band);
 
 	if (band == eCSR_BAND_MAX) {
 		/* Received change band request with invalid band value */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid band value %u", __func__, ui_band);
 		return -EINVAL;
 	}
 
 	if ((band == eCSR_BAND_24 && pHddCtx->config->nBandCapability == 2) ||
 	    (band == eCSR_BAND_5G && pHddCtx->config->nBandCapability == 1)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: band value %u violate INI settings %u", __func__,
 			  band, pHddCtx->config->nBandCapability);
 		return -EIO;
@@ -9308,7 +9308,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 	}
 
 	if (QDF_STATUS_SUCCESS != sme_get_freq_band(hHal, &currBand)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Failed to get current band config", __func__);
 		return -EIO;
 	}
@@ -9318,7 +9318,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 		 * Abort pending scan requests, flush the existing scan results,
 		 * and change the band capability
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 			  "%s: Current band value = %u, new setting %u ",
 			  __func__, currBand, band);
 
@@ -9359,7 +9359,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 							    eCSR_DISCONNECT_REASON_UNSPECIFIED);
 
 				if (QDF_STATUS_SUCCESS != status) {
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       "%s csr_roam_disconnect failure, returned %d",
 					       __func__, (int)status);
 					return -EINVAL;
@@ -9372,7 +9372,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 									    (WLAN_WAIT_TIME_DISCONNECT));
 
 				if (lrc == 0) {
-					hddLog(CDF_TRACE_LEVEL_ERROR,
+					hddLog(QDF_TRACE_LEVEL_ERROR,
 					       "%s:Timeout while waiting for csr_roam_disconnect",
 					       __func__);
 					return -ETIMEDOUT;
@@ -9388,7 +9388,7 @@ int hdd_set_band(struct net_device *dev, u8 ui_band)
 
 		if (QDF_STATUS_SUCCESS !=
 		    sme_set_freq_band(hHal, pAdapter->sessionId, band)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL,
 				  FL("Failed to set the band value to %u"),
 				  band);
 			return -EINVAL;
@@ -9423,7 +9423,7 @@ static int __iw_set_band_config(struct net_device *dev,
 	ENTER();
 
 	if (!capable(CAP_NET_ADMIN)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			FL("permission check failed"));
 		return -EPERM;
 	}
@@ -9505,7 +9505,7 @@ static int __iw_set_two_ints_getnone(struct net_device *dev,
 		hdd_info("WE_DUMP_DP_TRACE_LEVEL: %d %d",
 		       value[1], value[2]);
 		if (value[1] == DUMP_DP_TRACE)
-			cdf_dp_trace_dump_all(value[2]);
+			qdf_dp_trace_dump_all(value[2]);
 		break;
 	default:
 		hddLog(LOGE, "%s: Invalid IOCTL command %d", __func__, sub_cmd);
@@ -10765,19 +10765,19 @@ int hdd_register_wext(struct net_device *dev)
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: hdd_set_wext failed!!"));
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->hdd_cdf_event))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: HDD cdf event init failed!!"));
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_event_create(&pwextBuf->scanevent))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  ("ERROR: HDD scan event init failed!!"));
 		return QDF_STATUS_E_FAILURE;
 	}
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index b09c0244261e..0e0a49dd77ec 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -64,19 +64,19 @@
 
 /* change logging behavior based upon debug flag */
 #ifdef HDD_WMM_DEBUG
-#define WMM_TRACE_LEVEL_FATAL      CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_ERROR      CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_WARN       CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_INFO       CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_INFO_HIGH  CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_INFO_LOW   CDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_FATAL      QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_ERROR      QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_WARN       QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_INFO       QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_INFO_HIGH  QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_INFO_LOW   QDF_TRACE_LEVEL_FATAL
 #else
-#define WMM_TRACE_LEVEL_FATAL      CDF_TRACE_LEVEL_FATAL
-#define WMM_TRACE_LEVEL_ERROR      CDF_TRACE_LEVEL_ERROR
-#define WMM_TRACE_LEVEL_WARN       CDF_TRACE_LEVEL_WARN
-#define WMM_TRACE_LEVEL_INFO       CDF_TRACE_LEVEL_INFO
-#define WMM_TRACE_LEVEL_INFO_HIGH  CDF_TRACE_LEVEL_INFO_HIGH
-#define WMM_TRACE_LEVEL_INFO_LOW   CDF_TRACE_LEVEL_INFO_LOW
+#define WMM_TRACE_LEVEL_FATAL      QDF_TRACE_LEVEL_FATAL
+#define WMM_TRACE_LEVEL_ERROR      QDF_TRACE_LEVEL_ERROR
+#define WMM_TRACE_LEVEL_WARN       QDF_TRACE_LEVEL_WARN
+#define WMM_TRACE_LEVEL_INFO       QDF_TRACE_LEVEL_INFO
+#define WMM_TRACE_LEVEL_INFO_HIGH  QDF_TRACE_LEVEL_INFO_HIGH
+#define WMM_TRACE_LEVEL_INFO_LOW   QDF_TRACE_LEVEL_INFO_LOW
 #endif
 
 #define WLAN_HDD_MAX_DSCP 0x3f
@@ -166,7 +166,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 
 	/* The TSPEC must be valid */
 	if (pAc->wmmAcTspecValid == false) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Invoked with invalid TSPEC", __func__);
 		return;
 	}
@@ -178,7 +178,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 	} else {
 		/* no service interval is present in the TSPEC */
 		/* this is OK, there just won't be U-APSD */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: No service interval supplied", __func__);
 		service_interval = 0;
 	}
@@ -194,7 +194,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 	    (pAc->wmmAcUapsdSuspensionInterval == suspension_interval) &&
 	    (pAc->wmmAcUapsdDirection == direction) &&
 	    (pAc->wmmAcIsUapsdEnabled == psb)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: No change in U-APSD parameters", __func__);
 		return;
 	}
@@ -210,7 +210,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 					   pHddCtx->config->DelayedTriggerFrmInt);
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Failed to enable U-APSD for AC=%d",
 			  __func__, acType);
 		return;
@@ -222,7 +222,7 @@ static void hdd_wmm_enable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 	pAc->wmmAcUapsdDirection = direction;
 	pAc->wmmAcIsUapsdEnabled = psb;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: Enabled UAPSD in TL srv_int=%d "
 		  "susp_int=%d dir=%d AC=%d",
 		  __func__,
@@ -255,13 +255,13 @@ static void hdd_wmm_disable_tl_uapsd(hdd_wmm_qos_context_t *pQosContext)
 						    acType, pAdapter->sessionId);
 
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 				  "%s: Failed to disable U-APSD for AC=%d",
 				  __func__, acType);
 		} else {
 			/* TL no longer has valid UAPSD info */
 			pAc->wmmAcUapsdInfoValid = false;
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Disabled UAPSD in TL for AC=%d",
 				  __func__, acType);
 		}
@@ -281,7 +281,7 @@ static void hdd_wmm_free_context(hdd_wmm_qos_context_t *pQosContext)
 {
 	hdd_adapter_t *pAdapter;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered, context %p", __func__, pQosContext);
 
 	if (unlikely((NULL == pQosContext) ||
@@ -325,12 +325,12 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext)
 	union iwreq_data wrqu;
 	char buf[MAX_NOTIFY_LEN + 1];
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered, context %p", __func__, pQosContext);
 
 	if (unlikely((NULL == pQosContext) ||
 		     (HDD_WMM_CTX_MAGIC != pQosContext->magic))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Invalid QoS Context", __func__);
 		return;
 	}
@@ -350,7 +350,7 @@ static void hdd_wmm_notify_app(hdd_wmm_qos_context_t *pQosContext)
 	pAdapter = pQosContext->pAdapter;
 
 	/* send the event */
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: Sending [%s]", __func__, buf);
 	wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, buf);
 }
@@ -388,7 +388,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data)
 		pAdapter->hdd_stats.hddTxRxStats.txXmitClassifiedAC[pQosContext->
 								    acType];
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 		  FL(
 		     "WMM inactivity Timer for AC=%d, currentCnt=%d, prevCnt=%d"
 		     ),
@@ -396,7 +396,7 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data)
 	if (pAc->wmmPrevTrafficCnt == currentTrafficCnt) {
 		/* there is no traffic activity, delete the TSPEC for this AC */
 		status = hdd_wmm_delts(pAdapter, pQosContext->handle);
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  FL(
 			     "Deleted TS on AC %d, due to inactivity with status = %d!!!"
 			     ),
@@ -409,15 +409,15 @@ static void hdd_wmm_inactivity_timer_cb(void *user_data)
 				qdf_mc_timer_start(&pAc->wmmInactivityTimer,
 						   pAc->wmmInactivityTime);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL(
 					     "Restarting inactivity timer failed on AC %d"
 					     ),
 					  acType);
 			}
 		} else {
-			CDF_ASSERT(qdf_mc_timer_get_current_state
+			QDF_ASSERT(qdf_mc_timer_get_current_state
 					   (&pAc->wmmInactivityTimer) ==
 				   QDF_TIMER_STATE_STOPPED);
 		}
@@ -456,7 +456,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext,
 				       hdd_wmm_inactivity_timer_cb,
 				       pQosContext);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("Initializing inactivity timer failed on AC %d"),
 			  acType);
 		return qdf_status;
@@ -465,7 +465,7 @@ hdd_wmm_enable_inactivity_timer(hdd_wmm_qos_context_t *pQosContext,
 	qdf_status = qdf_mc_timer_start(&pAc->wmmInactivityTimer,
 					inactivityTime);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  FL("Starting inactivity timer failed on AC %d"),
 			  acType);
 		qdf_status = qdf_mc_timer_destroy(&pAc->wmmInactivityTimer);
@@ -549,12 +549,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 	sme_ac_enum_type acType;
 	hdd_wmm_ac_status_t *pAc;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered, context %p", __func__, pQosContext);
 
 	if (unlikely((NULL == pQosContext) ||
 		     (HDD_WMM_CTX_MAGIC != pQosContext->magic))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Invalid QoS Context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -563,14 +563,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 	acType = pQosContext->acType;
 	pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: status %d flowid %d info %p",
 		  __func__, smeStatus, qosFlowId, pCurrentQosInfo);
 
 	switch (smeStatus) {
 
 	case SME_QOS_STATUS_SETUP_SUCCESS_IND:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Setup is complete", __func__);
 
 		/* there will always be a TSPEC returned with this
@@ -588,7 +588,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -601,7 +601,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 #ifdef FEATURE_WLAN_ESE
 		/* Check if the inactivity interval is specified */
 		if (pCurrentQosInfo && pCurrentQosInfo->inactivity_interval) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Inactivity timer value = %d for AC=%d",
 				  __func__,
 				  pCurrentQosInfo->inactivity_interval, acType);
@@ -617,7 +617,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: Setup is complete (U-APSD set previously)",
 			  __func__);
 
@@ -627,7 +627,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -640,7 +640,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_FAILURE_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Setup failed", __func__);
 		/* QoS setup failed */
 
@@ -649,7 +649,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		pAc->wmmAcAccessAllowed = false;
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
 
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -672,7 +672,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Setup Invalid Params, notify TL", __func__);
 		/* QoS setup failed */
 		pAc->wmmAcAccessAllowed = false;
@@ -689,7 +689,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			pAc->wmmAcAccessAllowed = true;
 
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -701,10 +701,10 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Setup failed, not a QoS AP", __func__);
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -716,13 +716,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_REQ_PENDING_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: Setup pending", __func__);
 		/* not a callback status -- ignore if we get it */
 		break;
 
 	case SME_QOS_STATUS_SETUP_MODIFIED_IND:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: Setup modified", __func__);
 		if (pCurrentQosInfo) {
 			/* update the TSPEC */
@@ -731,7 +731,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			       pCurrentQosInfo, sizeof(pAc->wmmAcTspecInfo));
 
 			if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
-				CDF_TRACE(QDF_MODULE_ID_HDD,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
 					  WMM_TRACE_LEVEL_INFO,
 					  "%s: Explicit Qos, notifying user space",
 					  __func__);
@@ -757,7 +757,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			pAc->wmmAcAccessAllowed = true;
 
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -773,7 +773,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_SET_FAILED:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Setup successful but U-APSD failed", __func__);
 
 		if (HDD_WMM_HANDLE_IMPLICIT == pQosContext->handle) {
@@ -789,7 +789,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			pAc->wmmAcAccessPending = false;
 
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -807,11 +807,11 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_RELEASE_SUCCESS_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: Release is complete", __func__);
 
 		if (pCurrentQosInfo) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: flows still active", __func__);
 
 			/* there is still at least one flow active for
@@ -823,7 +823,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			/* need to tell TL to update its UAPSD handling */
 			hdd_wmm_enable_tl_uapsd(pQosContext);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: last flow", __func__);
 
 			/* this is the last flow active for this AC so
@@ -839,7 +839,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		}
 
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -853,14 +853,14 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_RELEASE_FAILURE_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: Release failure", __func__);
 
 		/* we don't need to update our state or TL since
 		 * nothing has changed
 		 */
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -873,7 +873,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_RELEASE_QOS_LOST_IND:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 			  "%s: QOS Lost indication received", __func__);
 
 		/* current TSPEC is no longer valid */
@@ -889,7 +889,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 			pAc->wmmAcAccessGranted = false;
 			pAc->wmmAcAccessFailed = false;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				  "%s: Explicit Qos, notifying user space",
 				  __func__);
 
@@ -903,13 +903,13 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Release pending", __func__);
 		/* not a callback status -- ignore if we get it */
 		break;
 
 	case SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Release Invalid Params", __func__);
 		if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
 			/* this was triggered by an application */
@@ -920,7 +920,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Modification is complete, notify TL", __func__);
 
 		/* there will always be a TSPEC returned with this
@@ -966,7 +966,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: modification pending", __func__);
 		/* not a callback status -- ignore if we get it */
 		break;
@@ -999,7 +999,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	case SME_QOS_STATUS_MODIFY_SETUP_SUCCESS_IND_APSD_SET_FAILED:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Modify successful but U-APSD failed", __func__);
 
 		/* QoS modification was successful but setting U=APSD
@@ -1035,9 +1035,9 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: unexpected SME Status=%d", __func__, smeStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	/* if Tspec only allows downstream traffic then access is not
@@ -1055,7 +1055,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 		pAc->wmmAcAccessAllowed = true;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: complete, access for TL AC %d is%sallowed",
 		  __func__, acType, pAc->wmmAcAccessAllowed ? " " : " not ");
 
@@ -1074,12 +1074,12 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
 int hdd_wmmps_helper(hdd_adapter_t *pAdapter, uint8_t *ptr)
 {
 	if (NULL == pAdapter) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: pAdapter is NULL", __func__);
 		return -EINVAL;
 	}
 	if (NULL == ptr) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: ptr is NULL", __func__);
 		return -EINVAL;
 	}
@@ -1110,11 +1110,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 	sme_QosWmmTspecInfo qosInfo;
 	hdd_context_t *hdd_ctx;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered, context %p", __func__, pQosContext);
 
 	if (unlikely(HDD_WMM_CTX_MAGIC != pQosContext->magic)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Invalid QoS Context", __func__);
 		return;
 	}
@@ -1130,11 +1130,11 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 	acType = pQosContext->acType;
 	pAc = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: pAdapter %p acType %d", __func__, pAdapter, acType);
 
 	if (!pAc->wmmAcAccessNeeded) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: AC %d doesn't need service", __func__, acType);
 		pQosContext->magic = 0;
 		kfree(pQosContext);
@@ -1298,7 +1298,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 				      qosInfo.ts_info.up,
 				      &pQosContext->qosFlowId);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: sme_qos_setup_req returned %d flowid %d",
 		  __func__, smeStatus, pQosContext->qosFlowId);
 
@@ -1309,7 +1309,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 		/* setup is pending, so no more work to do now.  all
 		 * further work will be done in hdd_wmm_sme_callback()
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Setup is pending, no further work", __func__);
 
 		break;
@@ -1332,7 +1332,7 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 		/* for these cases everything is already setup so we
 		 * can signal TL that it has work to do
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Setup is complete, notify TL", __func__);
 
 		pAc->wmmAcAccessAllowed = true;
@@ -1342,9 +1342,9 @@ static void __hdd_wmm_do_implicit_qos(struct work_struct *work)
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: unexpected SME Status=%d", __func__, smeStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 #endif
 
@@ -1378,7 +1378,7 @@ QDF_STATUS hdd_wmm_init(hdd_adapter_t *pAdapter)
 	sme_QosWmmUpType *hddWmmDscpToUpMap = pAdapter->hddWmmDscpToUpMap;
 	uint8_t dscp;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 
 	/* DSCP to User Priority Lookup Table
@@ -1409,7 +1409,7 @@ QDF_STATUS hdd_wmm_adapter_init(hdd_adapter_t *pAdapter)
 	hdd_wmm_ac_status_t *pAcStatus;
 	sme_ac_enum_type acType;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 
 	pAdapter->hddWmmStatus.wmmQap = false;
@@ -1447,7 +1447,7 @@ QDF_STATUS hdd_wmm_adapter_clear(hdd_adapter_t *pAdapter)
 {
 	hdd_wmm_ac_status_t *pAcStatus;
 	sme_ac_enum_type acType;
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 	for (acType = 0; acType < WLAN_MAX_AC; acType++) {
 		pAcStatus = &pAdapter->hddWmmStatus.wmmAcStatus[acType];
@@ -1476,7 +1476,7 @@ QDF_STATUS hdd_wmm_adapter_close(hdd_adapter_t *pAdapter)
 {
 	hdd_wmm_qos_context_t *pQosContext;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 
 	/* free any context records that we still have linked */
@@ -1526,7 +1526,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 	 */
 
 #ifdef HDD_WMM_DEBUG
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 #endif /* HDD_WMM_DEBUG */
 
@@ -1534,7 +1534,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 	eth_hdr = (union generic_ethhdr *)pkt;
 
 #ifdef HDD_WMM_DEBUG
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: proto is 0x%04x", __func__, skb->protocol);
 #endif /* HDD_WMM_DEBUG */
 
@@ -1543,7 +1543,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 		ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_II)];
 		tos = ip_hdr->tos;
 #ifdef HDD_WMM_DEBUG
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				"%s: Ethernet II IP Packet, tos is %d",
 				__func__, tos);
 #endif /* HDD_WMM_DEBUG */
@@ -1552,7 +1552,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 		ipv6hdr = ipv6_hdr(skb);
 		tos = ntohs(*(const __be16 *)ipv6hdr) >> 4;
 #ifdef HDD_WMM_DEBUG
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				"%s: Ethernet II IPv6 Packet, tos is %d",
 				__func__, tos);
 #endif /* HDD_WMM_DEBUG */
@@ -1565,7 +1565,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 		ip_hdr = (struct iphdr *)&pkt[sizeof(eth_hdr->eth_8023)];
 		tos = ip_hdr->tos;
 #ifdef HDD_WMM_DEBUG
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				"%s: 802.3 LLC/SNAP IP Packet, tos is %d",
 				__func__, tos);
 #endif /* HDD_WMM_DEBUG */
@@ -1580,7 +1580,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 				&pkt[sizeof(eth_hdr->eth_IIv)];
 			tos = ip_hdr->tos;
 #ifdef HDD_WMM_DEBUG
-			CDF_TRACE(QDF_MODULE_ID_HDD,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
 				WMM_TRACE_LEVEL_INFO_LOW,
 				"%s: Ethernet II VLAN tagged IP Packet, tos is %d",
 				__func__, tos);
@@ -1602,7 +1602,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 				&pkt[sizeof(eth_hdr->eth_8023v)];
 			tos = ip_hdr->tos;
 #ifdef HDD_WMM_DEBUG
-			CDF_TRACE(QDF_MODULE_ID_HDD,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
 				WMM_TRACE_LEVEL_INFO_LOW,
 				"%s: 802.3 LLC/SNAP VLAN tagged IP Packet, tos is %d",
 				__func__, tos);
@@ -1610,7 +1610,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 		} else {
 			/* default */
 #ifdef HDD_WMM_DEBUG
-			CDF_TRACE(QDF_MODULE_ID_HDD,
+			QDF_TRACE(QDF_MODULE_ID_HDD,
 				WMM_TRACE_LEVEL_WARN,
 				"%s: VLAN tagged Unhandled Protocol, using default tos",
 				__func__);
@@ -1620,7 +1620,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 	} else {
 		/* default */
 #ifdef HDD_WMM_DEBUG
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_WARN,
 			"%s: Unhandled Protocol, using default tos",
 			__func__);
 #endif /* HDD_WMM_DEBUG */
@@ -1637,7 +1637,7 @@ void hdd_wmm_classify_pkt(hdd_adapter_t *adapter,
 	*user_pri = adapter->hddWmmDscpToUpMap[dscp];
 
 #ifdef HDD_WMM_DEBUG
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		"%s: tos is %d, dscp is %d, up is %d",
 		__func__, tos, dscp, *user_pri);
 #endif /* HDD_WMM_DEBUG */
@@ -1777,7 +1777,7 @@ void hdd_wmm_acquire_access_required(hdd_adapter_t *pAdapter,
 		pAdapter->psbChanged &= ~SME_QOS_UAPSD_CFG_VO_CHANGED_MASK;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Invalid AC Type", __func__);
 		break;
 	}
@@ -1799,7 +1799,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 {
 	hdd_wmm_qos_context_t *pQosContext;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered for AC %d", __func__, acType);
 
 	if (!hdd_wmm_is_active(pAdapter) ||
@@ -1808,7 +1808,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 		/* either we don't want QoS or the AP doesn't support
 		 * QoS or we don't want to do implicit QoS
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: QoS not configured on both ends ", __func__);
 
 		*pGranted =
@@ -1823,7 +1823,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 		/* request already pending so we need to wait for that
 		 * response
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Implicit QoS for TL AC %d already scheduled",
 			  __func__, acType);
 
@@ -1838,7 +1838,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 		/* request previously failed
 		 * allow access, but we'll be downgraded
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Implicit QoS for TL AC %d previously failed",
 			  __func__, acType);
 
@@ -1856,7 +1856,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 		return QDF_STATUS_SUCCESS;
 	}
 	/* we need to establish implicit QoS */
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: Need to schedule implicit QoS for TL AC %d, pAdapter is %p",
 		  __func__, acType, pAdapter);
 
@@ -1867,7 +1867,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 		/* no memory for QoS context.  Nothing we can do but
 		 * let data flow
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Unable to allocate context", __func__);
 		pAdapter->hddWmmStatus.wmmAcStatus[acType].wmmAcAccessAllowed =
 			true;
@@ -1889,7 +1889,7 @@ QDF_STATUS hdd_wmm_acquire_access(hdd_adapter_t *pAdapter,
 	INIT_WORK(&pQosContext->wmmAcSetupImplicitQos, hdd_wmm_do_implicit_qos);
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: Scheduling work for AC %d, context %p",
 		  __func__, acType, pQosContext);
 
@@ -1923,7 +1923,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 	 * enable UAPSD for any access categories
 	 */
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 
 	if (pRoamInfo->fReassocReq) {
@@ -1936,7 +1936,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 		 * parameters will be updated there
 		 */
 
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: Reassoc so no work, Exiting", __func__);
 
 		return QDF_STATUS_SUCCESS;
@@ -1945,7 +1945,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 	uapsdMask =
 		pRoamInfo->u.pConnectedProfile->modifyProfileFields.uapsd_mask;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: U-APSD mask is 0x%02x", __func__, (int)uapsdMask);
 
 	if (uapsdMask & HDD_AC_VO) {
@@ -1961,7 +1961,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
 	}
 
 	if (uapsdMask & HDD_AC_VI) {
@@ -1977,7 +1977,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
 	}
 
 	if (uapsdMask & HDD_AC_BK) {
@@ -1993,7 +1993,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
 	}
 
 	if (uapsdMask & HDD_AC_BE) {
@@ -2009,7 +2009,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 						   pAdapter->sessionId,
 						   pHddCtx->config->DelayedTriggerFrmInt);
 
-		CDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
+		QDF_ASSERT(QDF_IS_STATUS_SUCCESS(status));
 	}
 
 	status = sme_update_dsc_pto_up_mapping(pHddCtx->hHal,
@@ -2020,7 +2020,7 @@ QDF_STATUS hdd_wmm_assoc(hdd_adapter_t *pAdapter,
 		hdd_wmm_init(pAdapter);
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Exiting", __func__);
 
 	return QDF_STATUS_SUCCESS;
@@ -2051,7 +2051,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter,
 	bool qosConnection;
 	uint8_t acmMask;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered", __func__);
 
 	if ((eCSR_BSS_TYPE_INFRASTRUCTURE == eBssType) &&
@@ -2065,7 +2065,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter,
 		acmMask = 0x0;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: qap is %d, qosConnection is %d, acmMask is 0x%x",
 		  __func__, qap, qosConnection, acmMask);
 
@@ -2074,7 +2074,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter,
 
 	for (ac = 0; ac < WLAN_MAX_AC; ac++) {
 		if (qap && qosConnection && (acmMask & acm_mask_bit[ac])) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				  "%s: ac %d on", __func__, ac);
 
 			/* admission is required */
@@ -2094,7 +2094,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter,
 				wmmAcAccessAllowed = true;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				  "%s: ac %d off", __func__, ac);
 			/* admission is not required so access is allowed */
 			pAdapter->hddWmmStatus.wmmAcStatus[ac].
@@ -2105,7 +2105,7 @@ QDF_STATUS hdd_wmm_connect(hdd_adapter_t *pAdapter,
 
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Exiting", __func__);
 
 	return QDF_STATUS_SUCCESS;
@@ -2199,7 +2199,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 #endif
 	bool found = false;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered with handle 0x%x", __func__, handle);
 
 	/* see if a context already exists with the given handle */
@@ -2214,7 +2214,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 	mutex_unlock(&pAdapter->hddWmmStatus.wmmLock);
 	if (found) {
 		/* record with that handle already exists */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Record already exists with handle 0x%x",
 			  __func__, handle);
 
@@ -2250,10 +2250,10 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 			/* we didn't get back one of the
 			 * SME_QOS_STATUS_MODIFY_* status codes
 			 */
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 				  "%s: unexpected SME Status=%d", __func__,
 				  smeStatus);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return HDD_WLAN_WMM_STATUS_MODIFY_FAILED;
 		}
 
@@ -2269,7 +2269,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 	pQosContext = kmalloc(sizeof(*pQosContext), GFP_KERNEL);
 	if (NULL == pQosContext) {
 		/* no memory for QoS context.  Nothing we can do */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: Unable to allocate QoS context", __func__);
 		return HDD_WLAN_WMM_STATUS_INTERNAL_FAILURE;
 	}
@@ -2279,7 +2279,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 	if (pTspec->ts_info.up < HDD_WMM_UP_TO_AC_MAP_SIZE)
 		pQosContext->acType = hdd_wmm_up_to_ac_map[pTspec->ts_info.up];
 	else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: ts_info.up (%d) larger than max value (%d), use default acType (%d)",
 			  __func__, pTspec->ts_info.up,
 			  HDD_WMM_UP_TO_AC_MAP_SIZE - 1, hdd_wmm_up_to_ac_map[0]);
@@ -2289,7 +2289,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 	pQosContext->qosFlowId = 0;
 	pQosContext->magic = HDD_WMM_CTX_MAGIC;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: Setting up QoS, context %p", __func__, pQosContext);
 
 	mutex_lock(&pAdapter->hddWmmStatus.wmmLock);
@@ -2305,7 +2305,7 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 				      pTspec->ts_info.up,
 				      &pQosContext->qosFlowId);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO,
 		  "%s: sme_qos_setup_req returned %d flowid %d",
 		  __func__, smeStatus, pQosContext->qosFlowId);
 
@@ -2342,9 +2342,9 @@ hdd_wlan_wmm_status_e hdd_wmm_addts(hdd_adapter_t *pAdapter,
 		 * SME_QOS_STATUS_SETUP_* status codes
 		 */
 		hdd_wmm_free_context(pQosContext);
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: unexpected SME Status=%d", __func__, smeStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return HDD_WLAN_WMM_STATUS_SETUP_FAILED;
 	}
 #endif
@@ -2378,7 +2378,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
 	sme_QosStatusType smeStatus;
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered with handle 0x%x", __func__, handle);
 
 	/* locate the context with the given handle */
@@ -2396,12 +2396,12 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
 
 	if (false == found) {
 		/* we didn't find the handle */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 			  "%s: handle 0x%x not found", __func__, handle);
 		return HDD_WLAN_WMM_STATUS_RELEASE_FAILED_BAD_PARAM;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: found handle 0x%x, flow %d, AC %d, context %p",
 		  __func__, handle, qosFlowId, acType, pQosContext);
 
@@ -2409,7 +2409,7 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
 	smeStatus =
 		sme_qos_release_req(WLAN_HDD_GET_HAL_CTX(pAdapter), qosFlowId);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: SME flow %d released, SME status %d",
 		  __func__, qosFlowId, smeStatus);
 
@@ -2455,9 +2455,9 @@ hdd_wlan_wmm_status_e hdd_wmm_delts(hdd_adapter_t *pAdapter, uint32_t handle)
 		/* we didn't get back one of the
 		 * SME_QOS_STATUS_RELEASE_* status codes
 		 */
-		CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_ERROR,
 			  "%s: unexpected SME Status=%d", __func__, smeStatus);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		status = HDD_WLAN_WMM_STATUS_RELEASE_FAILED;
 	}
 
@@ -2484,7 +2484,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle)
 	hdd_wmm_qos_context_t *pQosContext;
 	hdd_wlan_wmm_status_e status = HDD_WLAN_WMM_STATUS_LOST;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 		  "%s: Entered with handle 0x%x", __func__, handle);
 
 	/* locate the context with the given handle */
@@ -2492,7 +2492,7 @@ hdd_wlan_wmm_status_e hdd_wmm_checkts(hdd_adapter_t *pAdapter, uint32_t handle)
 	list_for_each_entry(pQosContext,
 			    &pAdapter->hddWmmStatus.wmmContextList, node) {
 		if (pQosContext->handle == handle) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_HDD, WMM_TRACE_LEVEL_INFO_LOW,
 				  "%s: found handle 0x%x, context %p",
 				  __func__, handle, pQosContext);
 
diff --git a/core/hdd/src/wlan_hdd_wowl.c b/core/hdd/src/wlan_hdd_wowl.c
index 85ed2390751d..9f516fd8aa71 100644
--- a/core/hdd/src/wlan_hdd_wowl.c
+++ b/core/hdd/src/wlan_hdd_wowl.c
@@ -59,7 +59,7 @@ static inline int find_ptrn_len(const char *ptrn)
 
 static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status)
 {
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Return code = (%d)", __func__, cdf_ret_status);
 }
 
@@ -67,7 +67,7 @@ static void hdd_wowl_callback(void *pContext, QDF_STATUS cdf_ret_status)
 static void hdd_wowl_wake_indication_callback(void *pContext,
 		tpSirWakeReasonInd wake_reason_ind)
 {
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d",
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Wake Reason %d",
 		  __func__, wake_reason_ind->ulReason);
 	hdd_exit_wowl((hdd_adapter_t *) pContext);
 }
@@ -83,25 +83,25 @@ static void dump_hdd_wowl_ptrn(struct wow_add_pattern *ptrn)
 {
 	int i;
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Patetrn Id = 0x%x", __func__, ptrn->pattern_id);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: Pattern Byte Offset = 0x%x", __func__,
 		  ptrn->pattern_byte_offset);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: pattern_size = 0x%x", __func__, ptrn->pattern_size);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: pattern_mask_size = 0x%x", __func__,
 		  ptrn->pattern_mask_size);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: Pattern: ",
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: Pattern: ",
 		  __func__);
 	for (i = 0; i < ptrn->pattern_size; i++)
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, " %02X",
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, " %02X",
 			  ptrn->pattern[i]);
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ",
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%s: pattern_mask: ",
 		  __func__);
 	for (i = 0; i < ptrn->pattern_mask_size; i++)
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO, "%02X",
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO, "%02X",
 			  ptrn->pattern_mask[i]);
 }
 
@@ -139,8 +139,8 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 				/* Pattern Already configured, skip to
 				 * next pattern
 				 */
-				CDF_TRACE(QDF_MODULE_ID_HDD,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_HDD,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "Trying to add duplicate WoWL pattern. Skip it!");
 				ptrn += len;
 				goto next_ptrn;
@@ -159,7 +159,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 
 		/* Maximum number of patterns have been configured already */
 		if (first_empty_slot == -1) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Cannot add anymore patterns. No free slot!",
 				  __func__);
 			return false;
@@ -167,7 +167,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		/* Validate the pattern */
 		if (ptrn[2] != WOWL_INTRA_PTRN_TOKENIZER ||
 		    ptrn[5] != WOWL_INTRA_PTRN_TOKENIZER) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Malformed pattern string. Skip!",
 				  __func__);
 			ptrn += len;
@@ -186,7 +186,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE
 		    || localPattern.pattern_mask_size >
 		    WOWL_PTRN_MASK_MAX_SIZE) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Invalid length specified. Skip!",
 				  __func__);
 			ptrn += len;
@@ -196,7 +196,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		offset = 5 + 2 * localPattern.pattern_size + 1;
 		if ((offset >= len) ||
 		    (ptrn[offset] != WOWL_INTRA_PTRN_TOKENIZER)) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Malformed pattern string..skip!",
 				  __func__);
 			ptrn += len;
@@ -206,7 +206,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		offset = offset + 2 * localPattern.pattern_mask_size;
 		if (offset + 1 != len) {
 			/* offset begins with 0 */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Malformed pattern string...skip!",
 				  __func__);
 			ptrn += len;
@@ -241,7 +241,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 		g_hdd_wowl_ptrns[first_empty_slot] =
 			kmalloc(len + 1, GFP_KERNEL);
 		if (g_hdd_wowl_ptrns[first_empty_slot] == NULL) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s: kmalloc failure", __func__);
 			return false;
 		}
@@ -258,7 +258,7 @@ bool hdd_add_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 						   sessionId);
 		if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
 			/* Add failed, so invalidate the local storage */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "sme_wowl_add_bcast_pattern failed with error code (%d)",
 				  cdf_ret_status);
 			kfree(g_hdd_wowl_ptrns[first_empty_slot]);
@@ -316,7 +316,7 @@ bool hdd_del_wowl_ptrn(hdd_adapter_t *pAdapter, const char *ptrn)
 						   sessionId);
 		if (QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
 			/* Remove from local storage as well */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "Deleted pattern with id %d [%s]", id,
 				  g_hdd_wowl_ptrns[id]);
 
@@ -350,7 +350,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 	uint16_t pattern_len, mask_len, i;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern index %d is out of range (0 ~ %d).",
 			  __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1);
 
@@ -361,7 +361,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 
 	/* Since the pattern is a hex string, 2 characters represent 1 byte. */
 	if (pattern_len % 2) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Malformed WoW pattern!", __func__);
 
 		return false;
@@ -369,7 +369,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 		pattern_len >>= 1;
 
 	if (!pattern_len || pattern_len > WOWL_PTRN_MAX_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern length %d is out of range (1 ~ %d).",
 			  __func__, pattern_len, WOWL_PTRN_MAX_SIZE);
 
@@ -382,7 +382,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 	localPattern.session_id = session_id;
 
 	if (localPattern.pattern_size > SIR_WOWL_BCAST_PATTERN_MAX_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern size (%d) greater than max (%d)",
 			  __func__, localPattern.pattern_size,
 			  SIR_WOWL_BCAST_PATTERN_MAX_SIZE);
@@ -406,13 +406,13 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 	mask_len = strlen(pattern_mask);
 	if ((mask_len % 2)
 	    || (localPattern.pattern_mask_size != (mask_len >> 1))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Malformed WoW pattern mask!", __func__);
 
 		return false;
 	}
 	if (localPattern.pattern_mask_size > WOWL_PTRN_MASK_MAX_SIZE) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern mask size (%d) greater than max (%d)",
 			  __func__, localPattern.pattern_mask_size,
 			  WOWL_PTRN_MASK_MAX_SIZE);
@@ -433,7 +433,7 @@ bool hdd_add_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx,
 		sme_wow_add_pattern(hHal, &localPattern, session_id);
 
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_wowl_add_bcast_pattern failed with error code (%d).",
 			  __func__, cdf_ret_status);
 
@@ -467,7 +467,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx)
 	uint8_t sessionId = pAdapter->sessionId;
 
 	if (pattern_idx > (WOWL_MAX_PTRNS_ALLOWED - 1)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern index %d is not in the range (0 ~ %d).",
 			  __func__, pattern_idx, WOWL_MAX_PTRNS_ALLOWED - 1);
 
@@ -475,7 +475,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx)
 	}
 
 	if (!g_hdd_wowl_ptrns_debugfs[pattern_idx]) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: WoW pattern %d is not in the table.",
 			  __func__, pattern_idx);
 
@@ -488,7 +488,7 @@ bool hdd_del_wowl_ptrn_debugfs(hdd_adapter_t *pAdapter, uint8_t pattern_idx)
 						    sessionId);
 
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_wowl_del_bcast_pattern failed with error code (%d).",
 			  __func__, cdf_ret_status);
 
@@ -544,7 +544,7 @@ bool hdd_enter_wowl(hdd_adapter_t *pAdapter, bool enable_mp, bool enable_pbm)
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
 		if (QDF_STATUS_PMC_PENDING != cdf_ret_status) {
 			/* We failed to enter WoWL */
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "sme_enter_wowl failed with error code (%d)",
 				  cdf_ret_status);
 			return false;
@@ -569,7 +569,7 @@ bool hdd_exit_wowl(hdd_adapter_t *pAdapter)
 
 	cdf_ret_status = sme_exit_wowl(hHal, &wowParams);
 	if (!QDF_IS_STATUS_SUCCESS(cdf_ret_status)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "sme_exit_wowl failed with error code (%d)",
 			  cdf_ret_status);
 		return false;
diff --git a/core/mac/src/include/utils_api.h b/core/mac/src/include/utils_api.h
index 6a344befe9f2..445b545c2eee 100644
--- a/core/mac/src/include/utils_api.h
+++ b/core/mac/src/include/utils_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -59,7 +59,7 @@ extern void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
 
 extern uint32_t gPktAllocCnt, gPktFreeCnt;
 
-extern CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel);
+extern QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel);
 
 /* / Log initialization */
 extern tSirRetStatus log_init(tpAniSirGlobal);
diff --git a/core/mac/src/pe/include/lim_trace.h b/core/mac/src/pe/include/lim_trace.h
index 494edc8703b5..dbd4ed714e4f 100644
--- a/core/mac/src/pe/include/lim_trace.h
+++ b/core/mac/src/pe/include/lim_trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -40,7 +40,7 @@
 
 #include "lim_global.h"
 #include "mac_trace.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #ifdef LIM_TRACE_RECORD
 
 #define LIM_TRACE_GET_SSN(data)    (((data) >> 16) & 0xff)
@@ -85,7 +85,7 @@ void limTraceUpdateMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
 void lim_trace_dumpMgmtStat(tpAniSirGlobal pMac, uint8_t subtype);
 uint8_t *lim_trace_get_mlm_state_string(uint32_t mlmState);
 uint8_t *lim_trace_get_sme_state_string(uint32_t smeState);
-void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
+void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
 		    uint16_t recIndex);
 void mac_trace_msg_tx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
 void mac_trace_msg_rx(tpAniSirGlobal pMac, uint8_t session, uint32_t data);
diff --git a/core/mac/src/pe/lim/lim_api.c b/core/mac/src/pe/lim/lim_api.c
index e62c655ae3ff..4bdfe04f661f 100644
--- a/core/mac/src/pe/lim/lim_api.c
+++ b/core/mac/src/pe/lim/lim_api.c
@@ -661,7 +661,7 @@ void lim_cleanup(tpAniSirGlobal pMac)
 			&pMac->lim.gLimMgmtFrameRegistratinQueue,
 			(qdf_list_node_t **) &pLimMgmtRegistration) ==
 			QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			FL("Fixing leak! Deallocating pLimMgmtRegistration node"));
 			cdf_mem_free(pLimMgmtRegistration);
 		}
@@ -1857,16 +1857,16 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
 
 	if (roam_offload_synch_ind_ptr->beaconProbeRespLength <=
 			SIR_MAC_HDR_LEN_3A) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, "%s: very"
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, "%s: very"
 		"few bytes in synchInd beacon / probe resp frame! length=%d",
 		__func__, roam_offload_synch_ind_ptr->beaconProbeRespLength);
 		cdf_mem_free(parsed_frm_ptr);
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		"LFR3:Beacon/Prb Rsp:%d", roam_offload_synch_ind_ptr->isBeacon);
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 	bcn_proberesp_ptr, roam_offload_synch_ind_ptr->beaconProbeRespLength);
 	if (roam_offload_synch_ind_ptr->isBeacon) {
 		if (sir_parse_beacon_ie(pMac, parsed_frm_ptr,
@@ -1875,7 +1875,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
 			roam_offload_synch_ind_ptr->beaconProbeRespLength -
 			SIR_MAC_HDR_LEN_3A) != eSIR_SUCCESS ||
 			!parsed_frm_ptr->ssidPresent) {
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			"Parse error Beacon, length=%d",
 			roam_offload_synch_ind_ptr->beaconProbeRespLength);
 			cdf_mem_free(parsed_frm_ptr);
@@ -1887,7 +1887,7 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
 			roam_offload_synch_ind_ptr->beaconProbeRespLength -
 			SIR_MAC_HDR_LEN_3A, parsed_frm_ptr) != eSIR_SUCCESS ||
 			!parsed_frm_ptr->ssidPresent) {
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			"Parse error ProbeResponse, length=%d",
 			roam_offload_synch_ind_ptr->beaconProbeRespLength);
 			cdf_mem_free(parsed_frm_ptr);
@@ -1969,11 +1969,11 @@ QDF_STATUS lim_roam_fill_bss_descr(tpAniSirGlobal pMac,
 				(uint8_t *)parsed_frm_ptr->mdie,
 				SIR_MDIE_SIZE);
 	}
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			"LFR3:%s:BssDescr Info:", __func__);
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			bss_desc_ptr->bssId, sizeof(tSirMacAddr));
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			"chan=%d, rssi=%d", bss_desc_ptr->channelId,
 			bss_desc_ptr->rssi);
 	if (ie_len) {
@@ -2015,10 +2015,10 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
 		return status;
 	}
 	lim_log(mac_ctx, LOGE, FL("LFR3:Received WMA_ROAM_OFFLOAD_SYNCH_IND"));
-	lim_log(mac_ctx, CDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"),
+	lim_log(mac_ctx, QDF_TRACE_LEVEL_DEBUG, FL("LFR3:auth=%d, vdevId=%d"),
 		roam_sync_ind_ptr->authStatus, roam_sync_ind_ptr->roamedVdevId);
 	lim_print_mac_addr(mac_ctx, roam_sync_ind_ptr->bssid.bytes,
-			CDF_TRACE_LEVEL_DEBUG);
+			QDF_TRACE_LEVEL_DEBUG);
 	session_ptr = pe_find_session_by_sme_session_id(mac_ctx,
 				roam_sync_ind_ptr->roamedVdevId);
 	if (session_ptr == NULL) {
@@ -2104,7 +2104,7 @@ QDF_STATUS pe_roam_synch_callback(tpAniSirGlobal mac_ctx,
 			mac_ctx->roam.reassocRespLen);
 
 	lim_log(mac_ctx, LOG1, FL("LFR3:the reassoc resp frame data:"));
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			mac_ctx->roam.pReassocResp,
 			mac_ctx->roam.reassocRespLen);
 	ft_session_ptr->bRoamSynchInProgress = true;
diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c
index 3326796d98eb..43917d0efcb2 100644
--- a/core/mac/src/pe/lim/lim_assoc_utils.c
+++ b/core/mac/src/pe/lim/lim_assoc_utils.c
@@ -2816,7 +2816,7 @@ tSirRetStatus lim_add_ft_sta_self(tpAniSirGlobal mac_ctx, uint16_t assoc_id,
 	msg_q.bodyptr = add_sta_params;
 	msg_q.bodyval = 0;
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			"Sending WMA_ADD_STA_REQ (aid %d)",
 			 add_sta_params->assocId);
 	MTRACE(mac_trace_msg_tx(mac_ctx, session_entry->peSessionId,
diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c
index ea9da9df20e3..2122371999eb 100644
--- a/core/mac/src/pe/lim/lim_ft.c
+++ b/core/mac/src/pe/lim/lim_ft.c
@@ -125,8 +125,8 @@ void lim_ft_cleanup_pre_auth_info(tpAniSirGlobal pMac, tpPESession psessionEntry
 		if (pReAssocSessionEntry->valid &&
 		    pReAssocSessionEntry->limSmeState ==
 		    eLIM_SME_WT_REASSOC_STATE) {
-			CDF_TRACE(QDF_MODULE_ID_PE,
-				  CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_PE,
+				  QDF_TRACE_LEVEL_DEBUG,
 				  FL("Deleting Preauth session(%d)"),
 				  pReAssocSessionEntry->peSessionId);
 			pe_delete_session(pMac, pReAssocSessionEntry);
@@ -1062,7 +1062,7 @@ void lim_post_ft_pre_auth_rsp(tpAniSirGlobal mac_ctx,
 	ft_pre_auth_rsp = (tpSirFTPreAuthRsp) cdf_mem_malloc(rsp_len);
 	if (NULL == ft_pre_auth_rsp) {
 		lim_log(mac_ctx, LOGE, "Failed to allocate memory");
-		CDF_ASSERT(ft_pre_auth_rsp != NULL);
+		QDF_ASSERT(ft_pre_auth_rsp != NULL);
 		return;
 	}
 	cdf_mem_zero(ft_pre_auth_rsp, rsp_len);
diff --git a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
index 9a4a436db4a7..697532dd8af5 100644
--- a/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
+++ b/core/mac/src/pe/lim/lim_ibss_peer_mgmt.c
@@ -1354,7 +1354,7 @@ __lim_ibss_search_and_delete_peer(tpAniSirGlobal pMac,
 	 * we set IBSS state to inactive.
 	 */
 	if (0 == pMac->lim.gLimNumIbssPeers) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  "Last STA from IBSS walked out");
 		psessionEntry->limIbssActive = false;
 	}
diff --git a/core/mac/src/pe/lim/lim_process_action_frame.c b/core/mac/src/pe/lim/lim_process_action_frame.c
index 8ef95ccd3c25..09b833413aae 100644
--- a/core/mac/src/pe/lim/lim_process_action_frame.c
+++ b/core/mac/src/pe/lim/lim_process_action_frame.c
@@ -1604,7 +1604,7 @@ static void __lim_process_sa_query_response_action_frame(tpAniSirGlobal pMac,
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
 	pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		  ("SA Query Response received..."));
 
 	/* When a station, supplicant handles SA Query Response.
@@ -2050,7 +2050,7 @@ void lim_process_action_frame(tpAniSirGlobal mac_ctx,
 			mac_hdr = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
 			frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
 			rssi = WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info);
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 				  ("Public Action TDLS Discovery RSP .."));
 			lim_send_sme_mgmt_frame_ind(mac_ctx,
 				mac_hdr->fc.subType, (uint8_t *) mac_hdr,
diff --git a/core/mac/src/pe/lim/lim_process_message_queue.c b/core/mac/src/pe/lim/lim_process_message_queue.c
index b3e17baa129c..7cd2a9dd7713 100644
--- a/core/mac/src/pe/lim/lim_process_message_queue.c
+++ b/core/mac/src/pe/lim/lim_process_message_queue.c
@@ -261,7 +261,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
 	if (pMac->lim.gLimSmeState == eLIM_SME_OFFLINE_STATE) {
 		/* Defer processsing this message */
 		if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+			QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 					FL("Unable to Defer Msg"));
 			lim_log_session_states(pMac);
 			lim_handle_defer_msg_error(pMac, limMsg);
@@ -316,7 +316,7 @@ uint8_t static def_msg_decision(tpAniSirGlobal pMac, tpSirMsgQ limMsg)
 			       )
 			/* Defer processsing this message */
 			if (lim_defer_msg(pMac, limMsg) != TX_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+				QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 					FL("Unable to Defer Msg"));
 				lim_log_session_states(pMac);
 				lim_handle_defer_msg_error(pMac, limMsg);
@@ -598,12 +598,12 @@ static void lim_handle_unknown_a2_index_frames(tpAniSirGlobal mac_ctx,
 	mac_hdr = WMA_GET_RX_MPDUHEADER3A(rx_pkt_buffer);
 
 	if (lim_is_group_addr(mac_hdr->addr2)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Ignoring A2 Invalid Packet received for MC/BC:"));
 		lim_print_mac_addr(mac_ctx, mac_hdr->addr2, LOG2);
 		return;
 	}
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			FL("type=0x%x, subtype=0x%x"),
 		mac_hdr->fc.type, mac_hdr->fc.subType);
 	/* Currently only following type and subtype are handled.
@@ -663,7 +663,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc,
 		if ((type == SIR_MAC_MGMT_FRAME)
 		    && (fc.type == SIR_MAC_MGMT_FRAME)
 		    && (sub_type == SIR_MAC_MGMT_RESERVED15)) {
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_HIGH,
 				FL
 				("rcvd frm match for SIR_MAC_MGMT_RESERVED15"));
 			match = true;
@@ -695,7 +695,7 @@ lim_check_mgmt_registered_frames(tpAniSirGlobal mac_ctx, uint8_t *buff_desc,
 	}
 
 	if (match) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			FL("rcvd frame match with registered frame params"));
 		/* Indicate this to SME */
 		lim_send_sme_mgmt_frame_ind(mac_ctx, hdr->fc.subType,
@@ -761,7 +761,7 @@ lim_handle80211_frames(tpAniSirGlobal pMac, tpSirMsgQ limMsg, uint8_t *pDeferMsg
 		FL("ProtVersion %d, Type %d, Subtype %d rateIndex=%d"),
 		fc.protVer, fc.type, fc.subType,
 		WMA_GET_RX_MAC_RATE_IDX(pRxPacketInfo));
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR, pHdr,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR, pHdr,
 			   WMA_GET_RX_MPDU_HEADER_LEN(pRxPacketInfo));
 #endif
 	if (pMac->fEnableDebugLog & 0x1) {
@@ -1194,7 +1194,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 	}
 	if (msg == NULL) {
 		lim_log(mac_ctx, LOGE, FL("Message pointer is Null"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 #ifdef WLAN_DEBUG
@@ -1218,7 +1218,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		 */
 		if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
 			if (!(mac_ctx->lim.deferredMsgCnt & 0xF))
-				CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+				QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 					FL("Unable to Defer Msg"));
 			lim_log_session_states(mac_ctx);
 			lim_print_msg_name(mac_ctx, LOGE, msg->type);
@@ -1253,7 +1253,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		 */
 		if (msg->bodyptr == NULL) {
 			lim_log(mac_ctx, LOGE, FL("Message bodyptr is Null"));
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 		cdf_mem_copy((uint8_t *) &new_msg,
@@ -1280,10 +1280,10 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		lim_handle80211_frames(mac_ctx, &new_msg, &defer_msg);
 
 		if (defer_msg == true) {
-			CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+			QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
 					FL("Defer Msg type=%x"), msg->type);
 			if (lim_defer_msg(mac_ctx, msg) != TX_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_PE, LOGE,
+				QDF_TRACE(QDF_MODULE_ID_PE, LOGE,
 						FL("Unable to Defer Msg"));
 				lim_log_session_states(mac_ctx);
 				cds_pkt_return_packet(body_ptr);
@@ -1410,7 +1410,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 				qdf_status =
 					session_entry->p2pGoPsNoaStartInd.status;
 				if (qdf_status != QDF_STATUS_SUCCESS)
-					CDF_TRACE(QDF_MODULE_ID_PE, LOGW,
+					QDF_TRACE(QDF_MODULE_ID_PE, LOGW,
 						FL(
 						"GO NOA start status %d by FW"),
 						qdf_status);
@@ -1419,7 +1419,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 		}
 
 		if (p2p_go_exists == 0)
-			CDF_TRACE(QDF_MODULE_ID_PE, LOGW,
+			QDF_TRACE(QDF_MODULE_ID_PE, LOGW,
 				FL(
 				"GO is removed by the time NOA start recvd"));
 
@@ -1600,7 +1600,7 @@ void lim_process_messages(tpAniSirGlobal mac_ctx, tpSirMsgQ msg)
 	case SIR_HAL_TDLS_SHOULD_DISCOVER:
 	case SIR_HAL_TDLS_SHOULD_TEARDOWN:
 	case SIR_HAL_TDLS_PEER_DISCONNECTED:
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			("%s received tdls event: 0x%x"), __func__, msg->type);
 		lim_send_sme_tdls_event_notify(mac_ctx, msg->type,
 					(void *)msg->bodyptr);
@@ -2080,10 +2080,10 @@ void lim_log_session_states(tpAniSirGlobal mac_ctx)
 
 	for (i = 0; i < mac_ctx->lim.maxBssId; i++) {
 		if (mac_ctx->lim.gpSession[i].valid) {
-			CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+			QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
 				FL("sysRole(%d) Session (%d)"),
 				mac_ctx->lim.gLimSystemRole, i);
-			CDF_TRACE(QDF_MODULE_ID_PE, LOG1,
+			QDF_TRACE(QDF_MODULE_ID_PE, LOG1,
 				FL("SME: Curr %s,Prev %s,MLM: Curr %s,Prev %s"),
 				lim_sme_state_str(
 				mac_ctx->lim.gpSession[i].limSmeState),
diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
index 04edc0c4eaab..9ec47dc98a30 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c
@@ -302,7 +302,7 @@ void lim_process_mlm_start_cnf(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 			(cds_get_channel_state(channelId) !=
 			 CHANNEL_STATE_DFS))) {
 			/* Configure beacon and send beacons to HAL */
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 					FL("Start Beacon with ssid %s Ch %d"),
 					psessionEntry->ssId.ssId,
 					psessionEntry->currentOperChannel);
@@ -840,7 +840,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	if (session->bRoamSynchInProgress) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR3:Re-set the LIM Ctxt Roam Synch In Progress"));
 		session->bRoamSynchInProgress = false;
 	}
@@ -850,7 +850,7 @@ void lim_process_mlm_reassoc_cnf(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 		lim_mlm_reassoc_cnf->resultCode);
 	if (lim_mlm_reassoc_cnf->resultCode == eSIR_SME_SUCCESS) {
 		/* Successful Reassociation */
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			  FL("*** Reassociated with new BSS ***"));
 
 		session->limSmeState = eLIM_SME_LINK_EST_STATE;
@@ -2752,7 +2752,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 						    psessionEntry);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 } else {
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 		  "LFR3:Do not activate timer and dont send the reassoc req");
 }
 #endif
@@ -2876,7 +2876,7 @@ lim_process_sta_mlm_add_bss_rsp_ft(tpAniSirGlobal pMac, tpSirMsgQ limMsgQ,
 	}
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	if (psessionEntry->bRoamSynchInProgress) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR3:Prepare and save pAddStaReq in pMac for post-assoc-rsp");
 		lim_process_assoc_rsp_frame(pMac, pMac->roam.pReassocResp,
 					    LIM_REASSOC, psessionEntry);
@@ -2976,7 +2976,7 @@ lim_process_sta_mlm_add_bss_rsp(tpAniSirGlobal mac_ctx,
 		goto end;
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	if (session_entry->bRoamSynchInProgress)
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			"LFR3:lim_process_sta_mlm_add_bss_rsp");
 #endif
 
@@ -4132,7 +4132,7 @@ void lim_send_sme_scan_cache_updated_ind(uint8_t sessionId)
 
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)))
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_SME_SCAN_CACHE_UPDATED message to WMA",
 			  __func__);
 }
@@ -4154,7 +4154,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf)
 {
 	tSirScanOffloadEvent *pScanEvent = (tSirScanOffloadEvent *) buf;
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		  "scan_id = %u, scan_requestor_id 0x%x", pScanEvent->scanId,
 		  pScanEvent->requestor);
 	switch (pScanEvent->event) {
@@ -4212,7 +4212,7 @@ void lim_process_rx_scan_event(tpAniSirGlobal pMac, void *buf)
 	case SCAN_EVENT_DEQUEUED:
 	case SCAN_EVENT_PREEMPTED:
 	default:
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			  "Received unhandled scan event %u",
 			  pScanEvent->event);
 	}
diff --git a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
index 911b59fd9bf9..195e223b6c07 100644
--- a/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
+++ b/core/mac/src/pe/lim/lim_process_probe_rsp_frame.c
@@ -125,7 +125,7 @@ lim_process_probe_rsp_frame(tpAniSirGlobal mac_ctx, uint8_t *rx_Packet_info,
 	}
 
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_Packet_info);
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		FL("Probe Resp Frame Received: BSSID "
 		MAC_ADDRESS_STR " (RSSI %d)"),
 		MAC_ADDR_ARRAY(header->bssId),
@@ -345,7 +345,7 @@ lim_process_probe_rsp_frame_no_session(tpAniSirGlobal mac_ctx,
 	}
 
 	frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_packet_info);
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		  FL("Probe Resp Frame Received: BSSID "
 		  MAC_ADDRESS_STR " (RSSI %d)"),
 		  MAC_ADDR_ARRAY(header->bssId),
diff --git a/core/mac/src/pe/lim/lim_process_sme_req_messages.c b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
index 60cd82f72f4f..99b5795c6f45 100644
--- a/core/mac/src/pe/lim/lim_process_sme_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_sme_req_messages.c
@@ -694,7 +694,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 
 		/* Store Persona */
 		session->pePersona = sme_start_bss_req->bssPersona;
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  FL("PE PERSONA=%d"), session->pePersona);
 
 		/* Update the phymode */
@@ -713,7 +713,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 			IS_DOT11_MODE_HT(session->dot11mode);
 		session->vhtCapability =
 			IS_DOT11_MODE_VHT(session->dot11mode);
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  FL("*****session->vhtCapability = %d"),
 			  session->vhtCapability);
 		session->txLdpcIniFeatureEnabled =
@@ -820,7 +820,7 @@ __lim_handle_sme_start_bss_request(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 			sme_start_bss_req->sec_ch_offset;
 		session->htRecommendedTxWidthSet =
 			(session->htSecondaryChannelOffset) ? 1 : 0;
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  FL("cbMode %u"), sme_start_bss_req->cbMode);
 		if (session->vhtCapability || session->htCapability) {
 			chanwidth = sme_start_bss_req->vht_channel_width;
@@ -1692,7 +1692,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 
 		/*Store Persona */
 		session->pePersona = sme_join_req->staPersona;
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  FL("PE PERSONA=%d cbMode %u"),
 			  session->pePersona, sme_join_req->cbMode);
 		if (mac_ctx->roam.configParam.enable2x2)
@@ -1702,7 +1702,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 #ifdef WLAN_FEATURE_11AC
 		session->vhtCapability =
 			IS_DOT11_MODE_VHT(session->dot11mode);
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 			  "***__lim_process_sme_join_req: vhtCapability=%d****",
 			  session->vhtCapability);
 		if (session->vhtCapability) {
@@ -1718,7 +1718,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 			session->enableVhtGid =
 				sme_join_req->enableVhtGid;
 
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 				  FL("***txBFIniFeatureEnabled=%d***"),
 				  session->txBFIniFeatureEnabled);
 			if (wlan_cfg_get_int(mac_ctx,
@@ -1743,7 +1743,7 @@ __lim_process_sme_join_req(tpAniSirGlobal mac_ctx, uint32_t *msg_buf)
 				ret_code = eSIR_LOGP_EXCEPTION;
 				goto end;
 			}
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 				  "%s: txBFCsnValue=%d", __func__,
 				  sme_join_req->txBFCsnValue);
 			session->txbf_csn_value = sme_join_req->txBFCsnValue;
@@ -3414,7 +3414,7 @@ __lim_handle_sme_stop_bss_request(tpAniSirGlobal pMac, uint32_t *pMsgBuf)
 		} else {
 			lim_log(pMac, LOGE,
 				FL("lim_del_sta failed with Status : %d"), status);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 	}
 	/* send a delBss to HAL and wait for a response */
@@ -4998,7 +4998,7 @@ static void lim_process_sme_start_beacon_req(tpAniSirGlobal pMac, uint32_t *pMsg
 		 * Tx right after the WMA_ADD_BSS_RSP.
 		 */
 		lim_apply_configuration(pMac, psessionEntry);
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 			  FL("Start Beacon with ssid %s Ch %d"),
 			  psessionEntry->ssId.ssId,
 			  psessionEntry->currentOperChannel);
@@ -5263,8 +5263,8 @@ static void lim_process_modify_add_ies(tpAniSirGlobal mac_ctx,
 	case eUPDATE_IE_ASSOC_RESP:
 		/* assoc resp IE */
 		if (add_ie_params->assocRespDataLen == 0) {
-			CDF_TRACE(QDF_MODULE_ID_PE,
-					CDF_TRACE_LEVEL_ERROR, FL(
+			QDF_TRACE(QDF_MODULE_ID_PE,
+					QDF_TRACE_LEVEL_ERROR, FL(
 				"assoc resp add ie not present %d"),
 				add_ie_params->assocRespDataLen);
 		}
diff --git a/core/mac/src/pe/lim/lim_process_tdls.c b/core/mac/src/pe/lim/lim_process_tdls.c
index ed749a919bcc..c4653bee86de 100644
--- a/core/mac/src/pe/lim/lim_process_tdls.c
+++ b/core/mac/src/pe/lim/lim_process_tdls.c
@@ -2417,7 +2417,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 
 		if (NULL == pStaDs) {
 			lim_log(pMac, LOGE, FL("add hash entry failed"));
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return eSIR_FAILURE;
 		}
 	}
@@ -2433,7 +2433,7 @@ static tSirRetStatus lim_tdls_setup_add_sta(tpAniSirGlobal pMac,
 
 	if (eSIR_SUCCESS != status) {
 		/* should not fail */
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 	return status;
 }
@@ -2529,7 +2529,7 @@ QDF_STATUS lim_process_tdls_add_sta_rsp(tpAniSirGlobal pMac, void *msg,
 	       MAC_ADDR_ARRAY(pAddStaParams->staMac));
 
 	if (pAddStaParams->status != QDF_STATUS_SUCCESS) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		lim_log(pMac, LOGE, FL("Add sta failed "));
 		status = eSIR_FAILURE;
 		goto add_sta_error;
@@ -2754,7 +2754,7 @@ tSirRetStatus lim_process_sme_tdls_mgmt_send_req(tpAniSirGlobal mac_ctx,
 
 	/* check if we are in proper state to work as TDLS client */
 	if (!LIM_IS_STA_ROLE(session_entry)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			  FL("send mgmt received in wrong system Role %d"),
 			  GET_LIM_SYSTEM_ROLE(session_entry));
 		goto lim_tdls_send_mgmt_error;
@@ -2937,7 +2937,7 @@ tSirRetStatus lim_process_sme_tdls_add_sta_req(tpAniSirGlobal pMac,
 
 	/* check if we are in proper state to work as TDLS client */
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			  "send mgmt received in wrong system Role %d",
 			  GET_LIM_SYSTEM_ROLE(psessionEntry));
 		goto lim_tdls_add_sta_error;
@@ -3005,7 +3005,7 @@ tSirRetStatus lim_process_sme_tdls_del_sta_req(tpAniSirGlobal pMac,
 
 	/* check if we are in proper state to work as TDLS client */
 	if (!LIM_IS_STA_ROLE(psessionEntry)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			  "Del sta received in wrong system Role %d",
 			  GET_LIM_SYSTEM_ROLE(psessionEntry));
 		goto lim_tdls_del_sta_error;
@@ -3103,13 +3103,13 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx,
 	uint32_t self_num_chan = WNI_CFG_VALID_CHANNEL_LIST_LEN;
 	uint8_t self_supp_chan[WNI_CFG_VALID_CHANNEL_LIST_LEN];
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 		  FL("Send Mgmt Recieved"));
 
 	session_entry = pe_find_session_by_bssid(mac_ctx, tdls_req->bssid.bytes,
 						 &session_id);
 	if (NULL == session_entry) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			  FL("PE Session does not exist for sme session_id %d"),
 			  tdls_req->sessionId);
 		lim_send_sme_tdls_link_establish_req_rsp(mac_ctx,
@@ -3120,7 +3120,7 @@ tSirRetStatus lim_process_sme_tdls_link_establish_req(tpAniSirGlobal mac_ctx,
 
 	/* check if we are in proper state to work as TDLS client */
 	if (!LIM_IS_STA_ROLE(session_entry)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 			  FL("TDLS Link Establish Request received in wrong system Role %d"),
 			  GET_LIM_SYSTEM_ROLE(session_entry));
 		goto lim_tdls_link_establish_error;
diff --git a/core/mac/src/pe/lim/lim_prop_exts_utils.c b/core/mac/src/pe/lim/lim_prop_exts_utils.c
index 5fcf9bac0f33..ac882aeab1ba 100644
--- a/core/mac/src/pe/lim/lim_prop_exts_utils.c
+++ b/core/mac/src/pe/lim/lim_prop_exts_utils.c
@@ -117,11 +117,11 @@ lim_extract_ap_capability(tpAniSirGlobal mac_ctx, uint8_t *p_ie,
 			mac_ctx->lim.htCapabilityPresentInBeacon = 0;
 
 #ifdef WLAN_FEATURE_11AC
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 			  "beacon.VHTCaps.present = %d BSS_VHT_Capable:%d",
 			  beacon_struct->VHTCaps.present,
 			  IS_BSS_VHT_CAPABLE(beacon_struct->VHTCaps));
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO_MED,
 			  "***beacon.SU Beamformer Capable*****=%d",
 			  beacon_struct->VHTCaps.suBeamFormerCap);
 
diff --git a/core/mac/src/pe/lim/lim_scan_result_utils.c b/core/mac/src/pe/lim/lim_scan_result_utils.c
index 283649fc3be8..2bc0f2047a50 100644
--- a/core/mac/src/pe/lim/lim_scan_result_utils.c
+++ b/core/mac/src/pe/lim/lim_scan_result_utils.c
@@ -98,7 +98,7 @@ lim_collect_bss_description(tpAniSirGlobal pMac,
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 
 	if (SIR_MAC_B_PR_SSID_OFFSET > WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo)) {
-		CDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >=
+		QDF_ASSERT(WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo) >=
 			   SIR_MAC_B_PR_SSID_OFFSET);
 		return QDF_STATUS_E_FAILURE;
 	}
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index b108064d5793..bc12d9a21bde 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -57,7 +57,7 @@
 #endif
 #include "lim_session.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_utils.h"
 #include "sme_trace.h"
 #if defined WLAN_FEATURE_VOWIFI
@@ -556,7 +556,7 @@ lim_send_probe_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 	if (((pe_session->pePersona == QDF_SAP_MODE) ||
 	    (pe_session->pePersona == QDF_P2P_GO_MODE)) &&
 	    (true == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL("CAC timer is running, probe response dropped"));
 		return;
 	}
@@ -1065,7 +1065,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 
 	/* Queue Addts Response frame in high priority WQ */
@@ -1074,7 +1074,7 @@ lim_send_addts_req_action_frame(tpAniSirGlobal pMac,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -1388,7 +1388,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 			(pe_session->pePersona == QDF_P2P_GO_MODE))
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 pe_session->peSessionId, mac_hdr->fc.subType));
 	/* Queue Association Response frame in high priority WQ */
 	qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) bytes,
@@ -1396,7 +1396,7 @@ lim_send_assoc_rsp_mgmt_frame(tpAniSirGlobal mac_ctx,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, frame, tx_flag,
 				sme_session, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 pe_session->peSessionId, qdf_status));
 
 	/* Pkt will be freed up by the callback */
@@ -1552,14 +1552,14 @@ lim_send_delts_req_action_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 				TXRX_FRM_802_11_MGMT,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	/* Pkt will be freed up by the callback */
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
@@ -1867,7 +1867,7 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 			bytes);
 
 		pe_session->limMlmState = pe_session->limPrevMlmState;
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
 				 pe_session->peSessionId,
 				 pe_session->limMlmState));
 
@@ -1950,14 +1950,14 @@ lim_send_assoc_req_mgmt_frame(tpAniSirGlobal mac_ctx,
 			      pe_session, eSIR_SUCCESS, eSIR_SUCCESS);
 #endif
 	mac_hdr = (tpSirMacMgmtHdr) frame;
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 pe_session->peSessionId, mac_hdr->fc.subType));
 	qdf_status =
 		wma_tx_frame(mac_ctx, packet,
 			   (uint16_t) (sizeof(tSirMacMgmtHdr) + payload),
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, frame, tx_flag, sme_sessionid, 0);
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       pe_session->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -2279,7 +2279,7 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 				 (void **)&frame, (void **)&packet);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		pe_session->limMlmState = pe_session->limPrevMlmState;
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
 				 pe_session->peSessionId,
 				 pe_session->limMlmState));
 		lim_log(mac_ctx, LOGP, FL("Failed to alloc memory %d"), bytes);
@@ -2384,14 +2384,14 @@ lim_send_reassoc_req_with_ft_ies_mgmt_frame(tpAniSirGlobal mac_ctx,
 	lim_diag_event_report(mac_ctx, WLAN_PE_DIAG_REASSOC_START_EVENT,
 			      pe_session, eSIR_SUCCESS, eSIR_SUCCESS);
 #endif
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 pe_session->peSessionId, mac_hdr->fc.subType));
 	qdf_status = wma_tx_frame(mac_ctx, packet,
 				(uint16_t) (bytes + ft_ies_length),
 				TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 				lim_tx_complete, frame, tx_flag, sme_sessionid,
 				0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       pe_session->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		lim_log(mac_ctx, LOGE,
@@ -2425,7 +2425,7 @@ void lim_send_retry_reassoc_req_frame(tpAniSirGlobal pMac,
 	pMac->lim.limTimers.gLimReassocFailureTimer.sessionId =
 		psessionEntry->peSessionId;
 	/* Start reassociation failure timer */
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TIMER_ACTIVATE,
 			 psessionEntry->peSessionId, eLIM_REASSOC_FAIL_TIMER));
 	if (tx_timer_activate(&pMac->lim.limTimers.gLimReassocFailureTimer)
 	    != TX_SUCCESS) {
@@ -2645,7 +2645,7 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 				      (void **)&pPacket);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		psessionEntry->limMlmState = psessionEntry->limPrevMlmState;
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_MLM_STATE,
 				 psessionEntry->peSessionId,
 				 psessionEntry->limMlmState));
 		lim_log(pMac, LOGP,
@@ -2720,14 +2720,14 @@ lim_send_reassoc_req_mgmt_frame(tpAniSirGlobal pMac,
 	lim_diag_event_report(pMac, WLAN_PE_DIAG_REASSOC_START_EVENT,
 			      psessionEntry, eSIR_SUCCESS, eSIR_SUCCESS);
 #endif
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status =
 		wma_tx_frame(pMac, pPacket,
 			   (uint16_t) (sizeof(tSirMacMgmtHdr) + nPayload),
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, pFrame, txFlag, smeSessionId, 0);
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       psessionEntry->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3016,14 +3016,14 @@ lim_send_auth_mgmt_frame(tpAniSirGlobal mac_ctx,
 		session->pePersona == QDF_STA_MODE)
 		tx_flag |= HAL_USE_PEER_STA_REQUESTED_MASK;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 session->peSessionId, mac_hdr->fc.subType));
 	/* Queue Authentication frame in high priority WQ */
 	qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) frame_len,
 				TXRX_FRM_802_11_MGMT,
 				ANI_TXDIR_TODS, 7, lim_tx_complete,
 				frame, tx_flag, sme_sessionid, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 session->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 		lim_log(mac_ctx, LOGE,
@@ -3293,7 +3293,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 	if (((psessionEntry->pePersona == QDF_SAP_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)) &&
 	    (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL
 				  ("CAC timer is running, drop disassoc from going out"));
 		return;
@@ -3372,7 +3372,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 	txFlag |= HAL_USE_PEER_STA_REQUESTED_MASK;
 
 	if (waitForAck) {
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 				 psessionEntry->peSessionId,
 				 pMacHdr->fc.subType));
 		/* Queue Disassociation frame in high priority WQ */
@@ -3383,7 +3383,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 					 ANI_TXDIR_TODS, 7, lim_tx_complete,
 					 pFrame, lim_disassoc_tx_complete_cnf,
 					 txFlag, smeSessionId, false, 0);
-		MTRACE(cdf_trace
+		MTRACE(qdf_trace
 			       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			       psessionEntry->peSessionId, qdf_status));
 
@@ -3405,7 +3405,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 			return;
 		}
 	} else {
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 				 psessionEntry->peSessionId,
 				 pMacHdr->fc.subType));
 		/* Queue Disassociation frame in high priority WQ */
@@ -3415,7 +3415,7 @@ lim_send_disassoc_mgmt_frame(tpAniSirGlobal pMac,
 					7,
 					lim_tx_complete, pFrame, txFlag,
 					smeSessionId, 0);
-		MTRACE(cdf_trace
+		MTRACE(qdf_trace
 			       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			       psessionEntry->peSessionId, qdf_status));
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
@@ -3472,7 +3472,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 	if (((psessionEntry->pePersona == QDF_SAP_MODE) ||
 	    (psessionEntry->pePersona == QDF_P2P_GO_MODE)) &&
 	    (true == pMac->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL
 				  ("CAC timer is running, drop the deauth from going out"));
 		return;
@@ -3554,7 +3554,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 #endif
 
 	if (waitForAck) {
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 				 psessionEntry->peSessionId,
 				 pMacHdr->fc.subType));
 		/* Queue Disassociation frame in high priority WQ */
@@ -3564,7 +3564,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 					 ANI_TXDIR_TODS, 7, lim_tx_complete,
 					 pFrame, lim_deauth_tx_complete_cnf,
 					 txFlag, smeSessionId, false, 0);
-		MTRACE(cdf_trace
+		MTRACE(qdf_trace
 			       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			       psessionEntry->peSessionId, qdf_status));
 		/* Pkt will be freed up by the callback lim_tx_complete */
@@ -3598,7 +3598,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 			return;
 		}
 	} else {
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 				 psessionEntry->peSessionId,
 				 pMacHdr->fc.subType));
 #ifdef FEATURE_WLAN_TDLS
@@ -3621,7 +3621,7 @@ lim_send_deauth_mgmt_frame(tpAniSirGlobal pMac,
 #ifdef FEATURE_WLAN_TDLS
 	}
 #endif
-		MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+		MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 				 psessionEntry->peSessionId, qdf_status));
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			lim_log(pMac, LOGE,
@@ -3745,14 +3745,14 @@ lim_send_meas_report_frame(tpAniSirGlobal pMac,
 				       "easurement Report (0x%08x)."), nStatus);
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 ((psessionEntry) ? psessionEntry->
 			  peSessionId : NO_SESSION), pMacHdr->fc.subType));
 	qdf_status =
 		wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, pFrame, 0, 0);
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
 		       qdf_status));
@@ -3848,14 +3848,14 @@ lim_send_tpc_request_frame(tpAniSirGlobal pMac,
 				       "PC Request (0x%08x)."), nStatus);
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 ((psessionEntry) ? psessionEntry->
 			  peSessionId : NO_SESSION), pMacHdr->fc.subType));
 	qdf_status =
 		wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, pFrame, 0, 0);
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
 		       qdf_status));
@@ -3955,14 +3955,14 @@ lim_send_tpc_report_frame(tpAniSirGlobal pMac,
 				       "PC Report (0x%08x)."), nStatus);
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 ((psessionEntry) ? psessionEntry->
 			  peSessionId : NO_SESSION), pMacHdr->fc.subType));
 	qdf_status =
 		wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 			   TXRX_FRM_802_11_MGMT, ANI_TXDIR_TODS, 7,
 			   lim_tx_complete, pFrame, 0, 0);
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 		       ((psessionEntry) ? psessionEntry->peSessionId : NO_SESSION),
 		       qdf_status));
@@ -4089,14 +4089,14 @@ lim_send_channel_switch_mgmt_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 				TXRX_FRM_802_11_MGMT,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		lim_log(pMac, LOGE,
@@ -4223,7 +4223,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx,
 		frm.ext_chan_switch_ann_action.new_channel,
 			 frm.ext_chan_switch_ann_action.op_class);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			session_entry->peSessionId, mac_hdr->fc.subType));
 	qdf_status = wma_tx_frame(mac_ctx, packet, (uint16_t) num_bytes,
 						 TXRX_FRM_802_11_MGMT,
@@ -4231,7 +4231,7 @@ lim_send_extended_chan_switch_action_frame(tpAniSirGlobal mac_ctx,
 						 7,
 						 lim_tx_complete, frame,
 						 txFlag, sme_session_id, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			session_entry->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		lim_log(mac_ctx, LOGE,
@@ -4332,14 +4332,14 @@ lim_send_vht_opmode_notification_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac, pPacket, (uint16_t) nBytes,
 				TXRX_FRM_802_11_MGMT,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		lim_log(pMac, LOGE,
@@ -4476,7 +4476,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac,
 				pPacket,
@@ -4485,7 +4485,7 @@ lim_send_neighbor_report_request_frame(tpAniSirGlobal pMac,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		PELOGE(lim_log
@@ -4633,7 +4633,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac,
 				pPacket,
@@ -4642,7 +4642,7 @@ lim_send_link_report_action_frame(tpAniSirGlobal pMac,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		PELOGE(lim_log
@@ -4828,7 +4828,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac,
 				pPacket,
@@ -4837,7 +4837,7 @@ lim_send_radio_measure_report_action_frame(tpAniSirGlobal pMac,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		PELOGE(lim_log
@@ -5116,7 +5116,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
 		txFlag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_MGMT,
 			 psessionEntry->peSessionId, pMacHdr->fc.subType));
 	qdf_status = wma_tx_frame(pMac,
 				pPacket,
@@ -5125,7 +5125,7 @@ tSirRetStatus lim_send_sa_query_response_frame(tpAniSirGlobal pMac,
 				ANI_TXDIR_TODS,
 				7, lim_tx_complete, pFrame, txFlag,
 				smeSessionId, 0);
-	MTRACE(cdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
+	MTRACE(qdf_trace(QDF_MODULE_ID_PE, TRACE_CODE_TX_COMPLETE,
 			 psessionEntry->peSessionId, qdf_status));
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		PELOGE(lim_log
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index f7934499483a..49248017322c 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -91,7 +91,7 @@ lim_send_sme_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
 	sme_rsp = cdf_mem_malloc(sizeof(tSirSmeRsp));
 	if (NULL == sme_rsp) {
 		/* Buffer not available. Log error */
-		CDF_TRACE(QDF_MODULE_ID_PE, LOGP,
+		QDF_TRACE(QDF_MODULE_ID_PE, LOGP,
 			FL("call to AllocateMemory failed for eWNI_SME_*_RSP"));
 		return;
 	}
@@ -149,7 +149,7 @@ lim_send_sme_roc_rsp(tpAniSirGlobal mac_ctx, uint16_t msg_type,
 
 	sme_rsp = cdf_mem_malloc(sizeof(struct sir_roc_rsp));
 	if (NULL == sme_rsp) {
-		CDF_TRACE(QDF_MODULE_ID_PE, LOGP,
+		QDF_TRACE(QDF_MODULE_ID_PE, LOGP,
 			FL("call to AllocateMemory failed for eWNI_SME_*_RSP"));
 		return;
 	}
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 02e5b20b445f..c2e5dc0f4144 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -114,8 +114,8 @@ void pe_reset_protection_callback(void *ptr)
 	bool bcn_prms_changed = false;
 
 	if (pe_session_entry->valid == false) {
-		CDF_TRACE(QDF_MODULE_ID_PE,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL("session already deleted. exiting timer callback"));
 		return;
 	}
@@ -127,8 +127,8 @@ void pe_reset_protection_callback(void *ptr)
 	       pe_session_entry->gLimOverlapNonGfParams.protectionEnabled << 3 |
 	       pe_session_entry->gLimOlbcParams.protectionEnabled         << 4;
 
-	CDF_TRACE(QDF_MODULE_ID_PE,
-		  CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_PE,
+		  QDF_TRACE_LEVEL_INFO,
 		  FL("old protection state: 0x%04X, new protection state: 0x%04X\n"),
 		  pe_session_entry->old_protection_state,
 		  current_protection_state);
@@ -177,8 +177,8 @@ void pe_reset_protection_callback(void *ptr)
 	if ((current_protection_state !=
 		pe_session_entry->old_protection_state) &&
 		(false == mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running)) {
-		CDF_TRACE(QDF_MODULE_ID_PE,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL("protection changed, update beacon template\n"));
 		/* update beacon fix params and send update to FW */
 		cdf_mem_zero(&beacon_params, sizeof(tUpdateBeaconParams));
@@ -217,8 +217,8 @@ void pe_reset_protection_callback(void *ptr)
 				protection_fields_reset_timer,
 				SCH_PROTECTION_RESET_TIME)
 		!= QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_PE,
-			CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE,
+			QDF_TRACE_LEVEL_ERROR,
 			FL("cannot create or start protectionFieldsResetTimer\n"));
 	}
 }
@@ -326,7 +326,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId,
 	session_ptr->fWaitForProbeRsp = 0;
 	session_ptr->fIgnoreCapsChange = 0;
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 		FL("Create a new PE session(%d), BSSID: "MAC_ADDRESS_STR" Max No. of STA %d"),
 		session_ptr->peSessionId, MAC_ADDR_ARRAY(bssid), numSta);
 
@@ -376,7 +376,7 @@ pe_create_session(tpAniSirGlobal pMac, uint8_t *bssid, uint8_t *sessionId,
 				SCH_PROTECTION_RESET_TIME);
 		}
 		if (status != QDF_STATUS_SUCCESS)
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				FL("cannot create or start protectionFieldsResetTimer\n"));
 	}
 
@@ -532,12 +532,12 @@ void pe_delete_session(tpAniSirGlobal mac_ctx, tpPESession session)
 	TX_TIMER *timer_ptr;
 
 	if (!session || (session && !session->valid)) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 			  FL("session is not valid"));
 		return;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_DEBUG,
 		FL("Trying to delete PE session %d Opmode %d BssIdx %d BSSID: "MAC_ADDRESS_STR),
 		session->peSessionId, session->operMode,
 		session->bssIdx,
diff --git a/core/mac/src/pe/lim/lim_trace.c b/core/mac/src/pe/lim/lim_trace.c
index a5c76fa11eeb..10b8232e37a7 100644
--- a/core/mac/src/pe/lim/lim_trace.c
+++ b/core/mac/src/pe/lim/lim_trace.c
@@ -43,7 +43,7 @@
 
 #include "lim_trace.h"
 #include "lim_timer_utils.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 
 #ifdef LIM_TRACE_RECORD
 uint32_t g_mgmt_frame_stats[14];
@@ -106,10 +106,10 @@ static uint8_t *__lim_trace_get_mgmt_drop_reason_string(uint16_t dropReason)
 
 void lim_trace_init(tpAniSirGlobal pMac)
 {
-	cdf_trace_register(QDF_MODULE_ID_PE, (tp_cdf_trace_cb) &lim_trace_dump);
+	qdf_trace_register(QDF_MODULE_ID_PE, (tp_qdf_trace_cb) &lim_trace_dump);
 }
 
-void lim_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
+void lim_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
 		    uint16_t recIndex)
 {
 
diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c
index 8d9dac0b1545..2e71821d0baf 100644
--- a/core/mac/src/pe/lim/lim_utils.c
+++ b/core/mac/src/pe/lim/lim_utils.c
@@ -593,7 +593,7 @@ static void lim_deactivate_del_sta(tpAniSirGlobal mac_ctx, uint32_t bss_entry,
 		if (NULL == sta_ds)
 			continue;
 
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				FL("Deleting pmfSaQueryTimer for staid[%d]"),
 				sta_ds->staIndex);
 		tx_timer_deactivate(&sta_ds->pmfSaQueryTimer);
@@ -735,7 +735,7 @@ void lim_cleanup_mlm(tpAniSirGlobal mac_ctx)
 	 * the pmfSaQueryTimer for it
 	 */
 	if (cds_is_driver_recovering()) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_ERROR,
 				FL("SSR is detected, proceed to clean up pmfSaQueryTimer"));
 		for (bss_entry = 0; bss_entry < mac_ctx->lim.maxBssId;
 						bss_entry++) {
@@ -6812,7 +6812,7 @@ bool lim_validate_received_frame_a1_addr(tpAniSirGlobal mac_ctx,
 		tSirMacAddr a1, tpPESession session)
 {
 	if (mac_ctx == NULL || session == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 				"mac or session context is null");
 		/* let main routine handle it */
 		return true;
diff --git a/core/mac/src/pe/sch/sch_api.c b/core/mac/src/pe/sch/sch_api.c
index a7175651663e..5a6744da8f9f 100644
--- a/core/mac/src/pe/sch/sch_api.c
+++ b/core/mac/src/pe/sch/sch_api.c
@@ -270,7 +270,7 @@ tSirRetStatus sch_send_beacon_req(tpAniSirGlobal pMac, uint8_t *beaconPayload,
 	     psessionEntry->schBeaconOffsetBegin)) {
 		sch_log(pMac, LOGE, FL("Invalid p2pIeOffset:[%d]"),
 			pMac->sch.schObject.p2pIeOffset);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		cdf_mem_free(beaconParams);
 		return eSIR_FAILURE;
 	}
diff --git a/core/mac/src/pe/sch/sch_beacon_process.c b/core/mac/src/pe/sch/sch_beacon_process.c
index 93c78d501d2d..10809e6b372f 100644
--- a/core/mac/src/pe/sch/sch_beacon_process.c
+++ b/core/mac/src/pe/sch/sch_beacon_process.c
@@ -135,8 +135,8 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 			return;
 #ifdef FEATURE_WLAN_ESE
 		if (session->isESEconnection)
-			CDF_TRACE(QDF_MODULE_ID_PE,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_PE,
+				  QDF_TRACE_LEVEL_INFO,
 				  FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"),
 				  bcn_struct->erpPresent,
 				  bcn_struct->erpIEInfo.useProtection,
@@ -162,7 +162,7 @@ ap_beacon_process_24_ghz(tpAniSirGlobal mac_ctx, uint8_t *rx_pkt_info,
 	if (tmp_exp) {
 #ifdef FEATURE_WLAN_ESE
 		if (session->isESEconnection) {
-			CDF_TRACE(QDF_MODULE_ID_PE, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_PE, QDF_TRACE_LEVEL_INFO,
 				  FL("[INFOLOG]ESE 11g erpPresent=%d useProtection=%d nonErpPresent=%d"),
 				  bcn_struct->erpPresent,
 				  bcn_struct->erpIEInfo.useProtection,
diff --git a/core/mac/src/pe/sch/sch_debug.c b/core/mac/src/pe/sch/sch_debug.c
index 3f4f987526c8..d637ce3f0230 100644
--- a/core/mac/src/pe/sch/sch_debug.c
+++ b/core/mac/src/pe/sch/sch_debug.c
@@ -37,14 +37,14 @@
  *
  */
 
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "sch_debug.h"
 #define LOG_SIZE 256
 
 void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
 {
 
-	CDF_TRACE_LEVEL cdf_debug_level;
+	QDF_TRACE_LEVEL cdf_debug_level;
 	char logBuffer[LOG_SIZE];
 	va_list marker;
 
@@ -54,7 +54,7 @@ void sch_log(tpAniSirGlobal pMac, uint32_t loglevel, const char *pString, ...)
 	/* extracting arguments from pstring */
 	va_start(marker, pString);
 	vsnprintf(logBuffer, LOG_SIZE, pString, marker);
-	CDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer);
+	QDF_TRACE(QDF_MODULE_ID_PE, cdf_debug_level, "%s", logBuffer);
 	va_end(marker);
 }
 
diff --git a/core/mac/src/sys/common/src/wlan_qct_sys.c b/core/mac/src/sys/common/src/wlan_qct_sys.c
index dc42b0fda026..059dbcdd3aef 100644
--- a/core/mac/src/sys/common/src/wlan_qct_sys.c
+++ b/core/mac/src/sys/common/src/wlan_qct_sys.c
@@ -77,7 +77,7 @@ void sys_stop_complete_cb(void *pUserData)
 	qdf_event_t *pStopEvt = (qdf_event_t *) pUserData;
 	QDF_STATUS qdf_status = qdf_event_set(pStopEvt);
 
-	CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+	QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 
 }
 
@@ -113,10 +113,10 @@ QDF_STATUS sys_stop(v_CONTEXT_t p_cds_context)
 		qdf_status = QDF_STATUS_E_BADMSG;
 
 	qdf_status = qdf_wait_single_event(&g_stop_evt, SYS_STOP_TIMEOUT);
-	CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+	QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 
 	qdf_status = qdf_event_destroy(&g_stop_evt);
-	CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+	QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 
 	return qdf_status;
 }
@@ -138,9 +138,9 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 	void *hHal;
 
 	if (NULL == pMsg) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "%s: NULL pointer to cds_msg_t", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_INVAL;
 	}
 
@@ -157,31 +157,31 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 		case SYS_MSG_ID_MC_START:
 			/*
 			 * Handling for this message is not needed now so adding
-			 * debug print and CDF_ASSERT
+			 * debug print and QDF_ASSERT
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 				"Rx SYS_MSG_ID_MC_START msgType= %d [0x%08x]",
 				pMsg->type, pMsg->type);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 
 		case SYS_MSG_ID_MC_STOP:
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 				"Processing SYS MC STOP");
 
 			/* get the HAL context... */
 			hHal = cds_get_context(QDF_MODULE_ID_PE);
 			if (NULL == hHal) {
-				CDF_TRACE(QDF_MODULE_ID_SYS,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SYS,
+					QDF_TRACE_LEVEL_ERROR,
 					"%s: Invalid hHal", __func__);
 			} else {
 				qdf_status = sme_stop(hHal,
 						HAL_STOP_TYPE_SYS_DEEP_SLEEP);
-				CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+				QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 				qdf_status = mac_stop(hHal,
 						HAL_STOP_TYPE_SYS_DEEP_SLEEP);
-				CDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
+				QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
 
 				((sysResponseCback) pMsg->callback)(
 						(void *)pMsg->bodyptr);
@@ -195,7 +195,7 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 			 * Process MC thread probe.  Just callback to the
 			 * function that is in the message.
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 				"Rx SYS_MSG_ID_MC_THR_PROBE msgType=%d[0x%08x]",
 				pMsg->type, pMsg->type);
 			break;
@@ -209,23 +209,23 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 		case SYS_MSG_ID_FTM_RSP:
 			hHal = cds_get_context(QDF_MODULE_ID_PE);
 			if (NULL == hHal) {
-				CDF_TRACE(QDF_MODULE_ID_SYS,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SYS,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("Invalid hal"));
 				cdf_mem_free(pMsg->bodyptr);
 				break;
 			}
 			mac_ctx = PMAC_STRUCT(hHal);
 			if (NULL == mac_ctx) {
-				CDF_TRACE(QDF_MODULE_ID_SYS,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SYS,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("Invalid mac context"));
 				cdf_mem_free(pMsg->bodyptr);
 				break;
 			}
 			if (NULL == mac_ctx->ftm_msg_processor_callback) {
-				CDF_TRACE(QDF_MODULE_ID_SYS,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SYS,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("callback pointer is NULL"));
 				cdf_mem_free(pMsg->bodyptr);
 				break;
@@ -236,18 +236,18 @@ QDF_STATUS sys_mc_process_msg(v_CONTEXT_t p_cds_context, cds_msg_t *pMsg)
 			break;
 
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 				"Unknown message type msgType= %d [0x%08x]",
 				pMsg->type, pMsg->type);
 			break;
 
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SYS,
-				CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS,
+				QDF_TRACE_LEVEL_ERROR,
 				"Rx SYS unknown MC msgtype= %d [0x%08X]",
 				pMsg->type, pMsg->type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		qdf_status = QDF_STATUS_E_BADMSG;
 
 		if (pMsg->bodyptr)
@@ -275,9 +275,9 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	 * It is up to the callee to free it
 	 */
 	if (NULL == pMsg) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 				"NULL Message Pointer");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -289,10 +289,10 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	case WNI_CFG_DNLD_CNF:
 		/* Forward this message to the SYS module */
 		targetMQ = CDS_MQ_ID_SYS;
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			"Handling for the Message ID %d is removed in SYS",
 			pMsg->type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		break;
 
 		/*
@@ -301,11 +301,11 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 	case WNI_CFG_DNLD_RSP:
 		/* Forward this message to the HAL module */
 		targetMQ = CDS_MQ_ID_WMA;
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			"Handling for the Message ID %d is removed as no HAL",
 			pMsg->type);
 
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		break;
 
 	case WNI_CFG_GET_REQ:
@@ -329,10 +329,10 @@ void sys_process_mmh_msg(tpAniSirGlobal pMac, tSirMsgQ *pMsg)
 			break;
 		}
 
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			"Message of ID %d is not yet handled by SYS",
 			pMsg->type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	/*
diff --git a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h
index e6d71ea196c4..ab955b42ff2d 100644
--- a/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h
+++ b/core/mac/src/sys/legacy/src/platform/inc/sys_wrapper.h
@@ -49,7 +49,7 @@ extern "C" {
 #include "sys_def.h"
 #include "qdf_mc_timer.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 
 /* Interlocked Compare Exchange related definitions */
diff --git a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c
index f924d7ccb61e..82603e9b29c8 100644
--- a/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c
+++ b/core/mac/src/sys/legacy/src/platform/src/sys_wrapper.c
@@ -127,31 +127,31 @@ uint32_t tx_timer_activate(TX_TIMER *timer_ptr)
 
 	/* Put a check for the free builds */
 	if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) {
-		CDF_ASSERT(timer_ptr->tmrSignature == 0);
+		QDF_ASSERT(timer_ptr->tmrSignature == 0);
 
 		return TX_TIMER_ERROR;
 
 	}
 	/* Check for an uninitialized timer */
-	CDF_ASSERT(0 != strlen(TIMER_NAME));
+	QDF_ASSERT(0 != strlen(TIMER_NAME));
 
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "Timer %s being activated\n", TIMER_NAME);
 
 	status = qdf_mc_timer_start(&timer_ptr->cdf_timer,
 				    timer_ptr->initScheduleTimeInMsecs);
 
 	if (QDF_STATUS_SUCCESS == status) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 			  "Timer %s now activated\n", TIMER_NAME);
 		return TX_SUCCESS;
 	} else if (QDF_STATUS_E_ALREADY == status) {
 		/* starting timer fails because timer is already started; this is okay */
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 			  "Timer %s is already running\n", TIMER_NAME);
 		return TX_SUCCESS;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "Timer %s fails to activate\n", TIMER_NAME);
 		return TX_TIMER_ERROR;
 	}
@@ -179,7 +179,7 @@ uint32_t tx_timer_change(TX_TIMER *timer_ptr,
 {
 	/* Put a check for the free builds */
 	if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) {
-		CDF_ASSERT(timer_ptr->tmrSignature == 0);
+		QDF_ASSERT(timer_ptr->tmrSignature == 0);
 		return TX_TIMER_ERROR;
 	}
 	/* changes cannot be applied until timer stops running */
@@ -217,7 +217,7 @@ uint32_t tx_timer_change_context(TX_TIMER *timer_ptr,
 
 	/* Put a check for the free builds */
 	if (TX_AIRGO_TMR_SIGNATURE != timer_ptr->tmrSignature) {
-		CDF_ASSERT(timer_ptr->tmrSignature == 0);
+		QDF_ASSERT(timer_ptr->tmrSignature == 0);
 
 		return TX_TIMER_ERROR;
 	}
@@ -252,16 +252,16 @@ static void tx_main_timer_func(void *functionContext)
 	TX_TIMER *timer_ptr = (TX_TIMER *) functionContext;
 
 	if (NULL == timer_ptr) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
 	if (NULL == timer_ptr->pExpireFunc) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "Timer %s triggered", TIMER_NAME);
 
 	/* Now call the actual timer function, taking the function pointer, */
@@ -276,7 +276,7 @@ static void tx_main_timer_func(void *functionContext)
 		timer_ptr->rescheduleTimeInMsecs = 0;
 
 		if (QDF_STATUS_SUCCESS != status) {
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_WARN,
 				  "Unable to reschedule timer %s; status=%d",
 				  TIMER_NAME, status);
 		}
@@ -297,17 +297,17 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal,
 	QDF_STATUS status;
 
 	if (NULL == expiration_function) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "NULL timer expiration");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return TX_TIMER_ERROR;
 	}
 
 	if (NULL == name_ptr) {
 
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "NULL name pointer for timer");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return TX_TIMER_ERROR;
 	}
 	if (!initScheduleTimeInTicks)
@@ -338,13 +338,13 @@ uint32_t tx_timer_create_intern_debug(void *pMacGlobal,
 					tx_main_timer_func, (void *) timer_ptr,
 					fileName, lineNum);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "Cannot create timer for %s\n", TIMER_NAME);
 		return TX_TIMER_ERROR;
 	}
 
 	if (0 != rescheduleTimeInTicks) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 			  "Creating periodic timer for %s\n", TIMER_NAME);
 	}
 	/* Activate this timer if required */
@@ -396,13 +396,13 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr,
 	status = qdf_mc_timer_init(&timer_ptr->cdf_timer, QDF_TIMER_TYPE_SW,
 				   tx_main_timer_func, (void *) timer_ptr);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_ERROR,
 			  "Cannot create timer for %s\n", TIMER_NAME);
 		return TX_TIMER_ERROR;
 	}
 
 	if (0 != rescheduleTimeInTicks) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 			  "Creating periodic timer for %s\n", TIMER_NAME);
 	}
 	/* Activate this timer if required */
@@ -434,7 +434,7 @@ uint32_t tx_timer_create_intern(void *pMacGlobal, TX_TIMER *timer_ptr,
 uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 {
 	QDF_STATUS vStatus;
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "tx_timer_deactivate() called for timer %s\n", TIMER_NAME);
 
 	/* Put a check for the free builds */
@@ -444,7 +444,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 	/* if the timer is not running then we do not need to do anything here */
 	vStatus = qdf_mc_timer_stop(&timer_ptr->cdf_timer);
 	if (QDF_STATUS_SUCCESS != vStatus) {
-		CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "Unable to stop timer %s; status =%d\n",
 			  TIMER_NAME, vStatus);
 	}
@@ -455,7 +455,7 @@ uint32_t tx_timer_deactivate(TX_TIMER *timer_ptr)
 
 uint32_t tx_timer_delete(TX_TIMER *timer_ptr)
 {
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "tx_timer_delete() called for timer %s\n", TIMER_NAME);
 
 	/* Put a check for the free builds */
@@ -485,7 +485,7 @@ uint32_t tx_timer_delete(TX_TIMER *timer_ptr)
  */
 bool tx_timer_running(TX_TIMER *timer_ptr)
 {
-	CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO,
 		  "tx_timer_running() called for timer %s\n", TIMER_NAME);
 
 	/* Put a check for the free builds */
diff --git a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
index 5c0877a90647..02a46f51fb50 100644
--- a/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
+++ b/core/mac/src/sys/legacy/src/system/src/mac_init_api.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -58,7 +58,7 @@ tSirRetStatus mac_start(tHalHandle hHal, void *pHalMacStartParams)
 	tpAniSirGlobal pMac = (tpAniSirGlobal) hHal;
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		status = eSIR_FAILURE;
 		return status;
 	}
diff --git a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
index 88bac6af63e5..97703dc45994 100644
--- a/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
+++ b/core/mac/src/sys/legacy/src/system/src/sys_entry_func.c
@@ -137,8 +137,8 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg,
 					&sessionid);
 			if (pe_session &&
 				(pe_session->pePersona == QDF_SAP_MODE)) {
-				CDF_TRACE(QDF_MODULE_ID_SYS,
-					CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SYS,
+					QDF_TRACE_LEVEL_INFO_HIGH,
 					FL("CAC timer is running, dropping the mgmt frame"));
 				goto fail;
 			}
@@ -152,7 +152,7 @@ sys_bbt_process_message_core(tpAniSirGlobal mac_ctx, tpSirMsgQ msg,
 			(!lim_is_system_in_scan_state(mac_ctx)) &&
 			(GET_LIM_PROCESS_DEFD_MESGS(mac_ctx) != true) &&
 			!mac_ctx->lim.gLimSystemInScanLearnMode) {
-			CDF_TRACE(QDF_MODULE_ID_SYS, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SYS, QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("dropping received beacon in deffered state"));
 			goto fail;
 		}
diff --git a/core/mac/src/sys/legacy/src/utils/src/log_api.c b/core/mac/src/sys/legacy/src/utils/src/log_api.c
index 3b3581b0bc55..8efbd6b4eb8c 100644
--- a/core/mac/src/sys/legacy/src/utils/src/log_api.c
+++ b/core/mac/src/sys/legacy/src/utils/src/log_api.c
@@ -45,7 +45,7 @@
 #include "utils_global.h"
 #include "mac_init_api.h"
 
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 
 #ifdef ANI_OS_TYPE_ANDROID
 #include <linux/kernel.h>
@@ -132,25 +132,25 @@ void log_dbg(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
 #endif
 }
 
-CDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel)
+QDF_TRACE_LEVEL get_vos_debug_level(uint32_t debugLevel)
 {
 	switch (debugLevel) {
 	case LOGP:
-		return CDF_TRACE_LEVEL_FATAL;
+		return QDF_TRACE_LEVEL_FATAL;
 	case LOGE:
-		return CDF_TRACE_LEVEL_ERROR;
+		return QDF_TRACE_LEVEL_ERROR;
 	case LOGW:
-		return CDF_TRACE_LEVEL_WARN;
+		return QDF_TRACE_LEVEL_WARN;
 	case LOG1:
-		return CDF_TRACE_LEVEL_INFO;
+		return QDF_TRACE_LEVEL_INFO;
 	case LOG2:
-		return CDF_TRACE_LEVEL_INFO_HIGH;
+		return QDF_TRACE_LEVEL_INFO_HIGH;
 	case LOG3:
-		return CDF_TRACE_LEVEL_INFO_MED;
+		return QDF_TRACE_LEVEL_INFO_MED;
 	case LOG4:
-		return CDF_TRACE_LEVEL_INFO_LOW;
+		return QDF_TRACE_LEVEL_INFO_LOW;
 	default:
-		return CDF_TRACE_LEVEL_INFO_LOW;
+		return QDF_TRACE_LEVEL_INFO_LOW;
 	}
 }
 
@@ -183,7 +183,7 @@ static inline QDF_MODULE_ID get_vos_module_id(uint8_t modId)
 void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
 	       const char *pStr, va_list marker)
 {
-	CDF_TRACE_LEVEL cdf_debug_level;
+	QDF_TRACE_LEVEL cdf_debug_level;
 	QDF_MODULE_ID cdf_module_id;
 	char logBuffer[LOG_SIZE];
 
@@ -191,10 +191,10 @@ void log_debug(tpAniSirGlobal pMac, uint8_t modId, uint32_t debugLevel,
 	cdf_module_id = get_vos_module_id(modId);
 
 	vsnprintf(logBuffer, LOG_SIZE - 1, pStr, marker);
-	CDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer);
+	QDF_TRACE(cdf_module_id, cdf_debug_level, "%s", logBuffer);
 
 	/* The caller must check loglevel */
-	CDF_ASSERT((debugLevel <=
+	QDF_ASSERT((debugLevel <=
 		    pMac->utils.gLogDbgLevel[LOG_INDEX_FOR_MODULE(modId)])
 		   && (LOGP != debugLevel));
 } /*** end log_debug() ***/
diff --git a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
index 08024a248185..0c2038a3aafa 100644
--- a/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
+++ b/core/mac/src/sys/legacy/src/utils/src/mac_trace.c
@@ -45,7 +45,7 @@
 #include "csr_internal.h"
 #include "lim_global.h"
 #include "cdf_memory.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "wma_if.h"
 
 #ifdef TRACE_RECORD
@@ -746,7 +746,7 @@ void mac_trace(tpAniSirGlobal mac_ctx, uint8_t code,
 void mac_trace_new(tpAniSirGlobal mac_ctx, uint8_t module, uint8_t code,
 		   uint16_t session, uint32_t data)
 {
-	cdf_trace(module, code, session, data);
+	qdf_trace(module, code, session, data);
 }
 
 #endif
diff --git a/core/sap/dfs/inc/dfs.h b/core/sap/dfs/inc/dfs.h
index 28030a6d98a1..a9acc64154b5 100644
--- a/core/sap/dfs/inc/dfs.h
+++ b/core/sap/dfs/inc/dfs.h
@@ -81,7 +81,7 @@
 		if (((dfs) == NULL) ||				     \
 		    ((dfs) != NULL &&				       \
 		     ((_m) & (dfs)->dfs_debug_mask))) {		       \
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG, \
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG, \
 				 _fmt, __VA_ARGS__);	\
 		}						     \
 } while (0)
diff --git a/core/sap/dfs/src/dfs.c b/core/sap/dfs/src/dfs.c
index f807c3c74f63..85266dc37eb0 100644
--- a/core/sap/dfs/src/dfs.c
+++ b/core/sap/dfs/src/dfs.c
@@ -313,7 +313,7 @@ int dfs_attach(struct ieee80211com *ic)
 			dfs->events = NULL;
 			OS_FREE(dfs);
 			ic->ic_dfs = NULL;
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			    "%s[%d]: pulse buffer allocation failed",
 			    __func__, __LINE__);
 			return 1;
@@ -606,7 +606,7 @@ int dfs_radar_enable(struct ieee80211com *ic,
 	 * 0 on success.
 	 */
 	if (DFS_STATUS_FAIL == radar_filters_init_status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]: DFS Radar Filters Initialization Failed",
 			  __func__, __LINE__);
 		return -EIO;
diff --git a/core/sap/dfs/src/dfs_init.c b/core/sap/dfs/src/dfs_init.c
index 434b016eca2c..b4db534a0ade 100644
--- a/core/sap/dfs/src/dfs_init.c
+++ b/core/sap/dfs/src/dfs_init.c
@@ -75,7 +75,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 	int i, j;
 
 	if (dfs == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]: sc_dfs is NULL", __func__, __LINE__);
 		return;
 	}
@@ -86,7 +86,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 		pl = dfs->pulses;
 
 	if (pl == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]:  pl==NULL, dfs=%p", __func__, __LINE__, dfs);
 		return;
 	}
@@ -103,7 +103,7 @@ void dfs_reset_alldelaylines(struct ath_dfs *dfs, int seg_id)
 		}
 	} else {
 		if (dfs->dfs_b5radars == NULL) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				"%s[%d]: pl==NULL, b5radars=%p", __func__, __LINE__,
 				dfs->dfs_b5radars);
 			return;
@@ -220,7 +220,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 	uint32_t b5_maxdur;
 
 	if (dfs == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]: dfs is NULL", __func__, __LINE__);
 		return DFS_STATUS_FAIL;
 	}
@@ -234,7 +234,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 	 * the rest of the radar configuration as suspect.
 	 */
 	if (radar_info == NULL || radar_info->dfsdomain == 0) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]: Unknown dfs domain %d ",
 			  __func__, __LINE__, dfs->dfsdomain);
 		/* Disable radar detection since we don't have a radar domain */
@@ -245,7 +245,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 		return DFS_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s[%d]:dfsdomain=%d, numradars=%d, numb5radars=%d",
 		  __func__, __LINE__, radar_info->dfsdomain,
 		  radar_info->numradars, radar_info->numb5radars);
@@ -368,12 +368,12 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 		rf->rf_threshold = dfs_radars[p].rp_threshold;
 		rf->rf_filterlen = rf->rf_maxpri * rf->rf_numpulses;
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s[%d]: minprf = %d maxprf = %d pulsevar = %d thresh=%d",
 			  __func__, __LINE__, dfs_radars[p].rp_pulsefreq,
 			  dfs_radars[p].rp_max_pulsefreq,
 			  dfs_radars[p].rp_pulsevar, rf->rf_threshold);
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s[%d]:minpri = %d maxpri = %d filterlen = %d filterID = %d",
 			  __func__, __LINE__, rf->rf_minpri, rf->rf_maxpri,
 			  rf->rf_filterlen, rf->rf_pulseid);
@@ -405,7 +405,7 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 						sizeof(struct dfs_bin5radars),
 						GFP_KERNEL);
 		if (dfs->dfs_b5radars_ext_seg == NULL) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s:Fail allocate memory for ext bin5 radars",
 				  __func__);
 			goto bad4;
@@ -456,10 +456,10 @@ int dfs_init_radar_filters(struct ieee80211com *ic,
 		dfs_round((int32_t) ((max_pulsedur * 100 / 80) * 100));
 	/* relax the max pulse duration a little bit due to inaccuracy caused by chirping. */
 	dfs->dfs_rinfo.rn_maxpulsedur = dfs->dfs_rinfo.rn_maxpulsedur + 20;
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s[%d]: DFS min filter rssiThresh = %d",
 		  __func__, __LINE__, min_rssithresh);
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s[%d]:DFS max pulse dur = %d ticks",
 		  __func__, __LINE__, dfs->dfs_rinfo.rn_maxpulsedur);
 	return DFS_STATUS_SUCCESS;
diff --git a/core/sap/dfs/src/dfs_phyerr_tlv.c b/core/sap/dfs/src/dfs_phyerr_tlv.c
index 1df4e5dde783..3ac1d08c1071 100644
--- a/core/sap/dfs/src/dfs_phyerr_tlv.c
+++ b/core/sap/dfs/src/dfs_phyerr_tlv.c
@@ -154,52 +154,52 @@ radar_summary_print(struct ath_dfs *dfs,
 	else
 		is_chip_oversampling = PERE_IS_OVERSAMPLING(dfs);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "\n ############ Radar Summary ############\n");
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - pulsedur = %d micro seconds\n", __func__,
 		  rsu->pulse_duration);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - rssi = %d dbm\n", __func__,
 		  rsu->rssi);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - ischirp = %d\n", __func__,
 		  rsu->is_chirp);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - sidx = %d\n", __func__,
 		  rsu->sidx);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - delta_peak = %d\n", __func__,
 		  rsu->delta_peak);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - delta_diff = %d\n", __func__,
 		  rsu->delta_diff);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - raw tsf = %d\n", __func__,
 		  rsu->raw_tsf);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - tsf_offset = %d micro seconds\n",
 		  __func__, rsu->tsf_offset);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: Radar Summary - cooked tsf = %d\n", __func__,
 		  (rsu->raw_tsf - rsu->tsf_offset));
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s: frequency offset = %d.%d MHz (oversampling = %d)\n",
 		  __func__, (int) (rsu->freq_offset / 1000),
 		  (int) abs(rsu->freq_offset % 1000),
 		  is_chip_oversampling);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "\n ###################################\n");
 }
 
@@ -223,12 +223,12 @@ radar_summary_parse(struct ath_dfs *dfs, const char *buf, size_t len,
 	 */
 	if ((dfs->ic->dfs_hw_bd_id ==  DFS_HWBD_QCA6174) &&
 	    (len < sizeof(rs))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "%s: DFS-2 radar summary len = (%zu) wrong, expected = (%zu)",
 		  __func__, len, sizeof(rs));
 	} else if ((dfs->ic->dfs_hw_bd_id !=  DFS_HWBD_QCA6174) &&
 		(len < sizeof(dfs3_rs))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "%s: DFS-3 radar summary len = (%zu) wrong, expected = (%zu)",
 		  __func__, len, sizeof(dfs3_rs));
 	}
@@ -859,7 +859,7 @@ dfs_process_phyerr_bb_tlv(struct ath_dfs *dfs, void *buf, uint16_t datalen,
 		 * in noisy environments.
 		 */
 		if (!(invalid_phyerr_count & 0xFF)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 				"%s[%d]:parse failed invalid phyerror cnt = %d",
 				__func__, __LINE__, invalid_phyerr_count);
 		}
diff --git a/core/sap/dfs/src/dfs_process_phyerr.c b/core/sap/dfs/src/dfs_process_phyerr.c
index b07c4cfca6b0..f91aa6464629 100644
--- a/core/sap/dfs/src/dfs_process_phyerr.c
+++ b/core/sap/dfs/src/dfs_process_phyerr.c
@@ -463,7 +463,7 @@ static void dump_phyerr_contents(const char *d, int len)
 	 * Print the final line if we didn't print it above.
 	 */
 	if (n != 0)
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "%s: %s\n",
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "%s: %s\n",
 			  __func__, buf);
 #endif /* def CONFIG_ENABLE_DUMP_PHYERR_CONTENTS */
 }
@@ -480,7 +480,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
 	int empty;
 
 	if (dfs == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sc_dfs is NULL\n", __func__);
 		return;
 	}
@@ -509,7 +509,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
 		dump_phyerr_contents(buf, datalen);
 
 	if (chan == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: chan is NULL\n", __func__);
 		return;
 	}
@@ -588,7 +588,7 @@ dfs_process_phyerr(struct ieee80211com *ic, void *buf, uint16_t datalen,
 		}
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "\n %s: Frequency at which the phyerror was injected = %d",
 		  __func__, e.freq);
 	/*
diff --git a/core/sap/dfs/src/dfs_process_radarevent.c b/core/sap/dfs/src/dfs_process_radarevent.c
index 0cbed7eca11e..6c4613b19a82 100644
--- a/core/sap/dfs/src/dfs_process_radarevent.c
+++ b/core/sap/dfs/src/dfs_process_radarevent.c
@@ -137,7 +137,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 	struct dfs_delayline *dl;
 
 	if (dfs == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s[%d]: dfs is NULL", __func__, __LINE__);
 		return 0;
 	}
@@ -216,7 +216,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 
 		if (event == NULL) {
 			empty = 1;
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s[%d]: event is NULL ", __func__, __LINE__);
 			break;
 		}
@@ -404,7 +404,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 			dfs->radar_log[i].dur = re.re_dur;
 			dfs->dfs_event_log_count++;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s[%d]:xxxxx ts =%u re.re_dur=%u re.re_rssi =%u diff =%u pl->pl_lastelem.p_time=%llu xxxxx",
 			  __func__, __LINE__, (uint32_t) this_ts, re.re_dur,
 			  re.re_rssi, diff_ts,
@@ -436,7 +436,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 			 (diff_ts > 500 || diff_ts <= 305) &&
 			 (re.sidx == -4)) {
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			"\n%s: Rejecting on Peak Index = %d,re.re_dur = %d,diff_ts = %d\n",
 			__func__, re.sidx, re.re_dur, diff_ts);
 
@@ -465,16 +465,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 		     re.re_dur < DFS_TYPE4_WAR_PULSE_DURATION_UPPER_LIMIT) &&
 		    (diff_ts > DFS_TYPE4_WAR_PRI_LOWER_LIMIT &&
 		     diff_ts < DFS_TYPE4_WAR_PRI_UPPER_LIMIT)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"%s:chan->ic_flags=0x%x, MHz separation=%d\n",
 				__func__, chan->ic_flags,
 				chan->ic_pri_freq_center_freq_mhz_separation);
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"%s: Peak Idx =%d,re.re_dur =%d,diff_ts =%d\n",
 				__func__, re.sidx, re.re_dur, diff_ts);
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"\n%s: Modify pulse dur to fit valid range \n",
 				__func__);
 
@@ -502,16 +502,16 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 			diff_ts < DFS_ETSI_TYPE2_WAR_PRI_UPPER_LIMIT) ||
 		     (diff_ts > DFS_ETSI_TYPE3_WAR_PRI_LOWER_LIMIT &&
 			diff_ts < DFS_ETSI_TYPE3_WAR_PRI_UPPER_LIMIT))) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"\n%s:chan->ic_flags=0x%x,MHz Separation=%d\n",
 				__func__, chan->ic_flags,
 				chan->ic_pri_freq_center_freq_mhz_separation);
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"%s:Peak Index =%d,re.re_dur =%d,diff_ts =%d\n",
 				__func__, re.sidx, re.re_dur, diff_ts);
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				"%s:Modify ETSI pulse dur to valid range \n",
 				__func__);
 
@@ -598,8 +598,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 					    "%s : Rejecting on rssi rssi=%u thresh=%u",
 					    __func__, re.re_rssi,
 					    ft->ft_rssithresh);
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s[%d]: Rejecting on rssi rssi=%u thresh=%u",
 					  __func__, __LINE__, re.re_rssi,
 					  ft->ft_rssithresh);
@@ -623,8 +623,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 					    __func__,
 					    (unsigned long long)deltaT,
 					    ft->ft_minpri);
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s[%d]:Rejecting on pri pri=%lld minpri=%u",
 					  __func__, __LINE__,
 					  (unsigned long long)deltaT,
@@ -657,8 +657,8 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 							    (unsigned long long)
 							    deltaT,
 							    rf->rf_minpri);
-						CDF_TRACE(QDF_MODULE_ID_SAP,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_SAP,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s[%d]:filterID= %d::Rejecting on individual filter min PRI deltaT=%lld rf->rf_minpri=%u",
 							  __func__, __LINE__,
 							  rf->rf_pulseid,
@@ -680,9 +680,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 								    deltaT,
 								    rf->
 								    rf_minpri);
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SAP,
-								CDF_TRACE_LEVEL_INFO,
+								QDF_TRACE_LEVEL_INFO,
 								"%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u",
 								__func__, __LINE__,
 								rf->rf_pulseid,
@@ -719,9 +719,9 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 								    deltaT,
 								    rf->
 								    rf_minpri);
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SAP,
-								CDF_TRACE_LEVEL_INFO,
+								QDF_TRACE_LEVEL_INFO,
 								"%s[%d]:filterID= %d :: Rejecting on individual filter max PRI deltaT=%lld rf->rf_minpri=%u",
 								__func__, __LINE__,
 								rf->rf_pulseid,
@@ -770,7 +770,7 @@ int dfs_process_radarevent(struct ath_dfs *dfs,
 					    "Found on channel minDur = %d, filterId = %d",
 					    ft->ft_mindur,
 					    rf != NULL ? rf->rf_pulseid : -1);
-				CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 					"%s[%d]:### Found on channel minDur = %d, filterId = %d  seg_id = %d ###",
 					__func__, __LINE__, ft->ft_mindur,
 					rf != NULL ? rf->rf_pulseid : -1,
@@ -798,7 +798,7 @@ dfsfound:
 		 */
 		dfs->ic->ic_curchan->ic_radar_found_segid = seg_id;
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "%s[%d]:### RADAR FOUND ON CHANNEL %d (%d MHz),seg_id=%d ###",
 		  __func__, __LINE__, thischan->ic_ieee,
 		  thischan->ic_freq, seg_id);
@@ -861,7 +861,7 @@ dfsfound:
 		dfs->dfs_phyerr_freq_max = 0;
 		dfs->dfs_phyerr_w53_counter = 0;
 	}
-	/* CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */
+	/* QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO, "IN FUNC %s[%d]: retval = %d ",__func__,__LINE__,retval); */
 	return retval;
 /* #endif */
 /*        return 1; */
diff --git a/core/sap/src/sap_api_link_cntl.c b/core/sap/src/sap_api_link_cntl.c
index dadbaec9c363..086864b823f4 100644
--- a/core/sap/src/sap_api_link_cntl.c
+++ b/core/sap/src/sap_api_link_cntl.c
@@ -45,7 +45,7 @@
 /*----------------------------------------------------------------------------
  * Include Files
  * -------------------------------------------------------------------------*/
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 /* Pick up the CSR callback definition */
 #include "csr_api.h"
 #include "sme_api.h"
@@ -108,12 +108,12 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 #endif
 
 	if (NULL == hal_handle) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 					"In %s invalid hHal", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (sap_ctx->sapsMachine == eSAP_DISCONNECTED) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 				"In %s BSS already stopped", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -121,7 +121,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 	switch (scan_status) {
 	case eCSR_SCAN_SUCCESS:
 		/* sapScanCompleteCallback with eCSR_SCAN_SUCCESS */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, CSR scanStatus = %s (%d)", __func__,
 			  "eCSR_SCAN_SUCCESS", scan_status);
 
@@ -138,20 +138,20 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 		if ((get_result_status != QDF_STATUS_SUCCESS)
 		    && (get_result_status != QDF_STATUS_E_NULL_VALUE)) {
 			/* No scan results */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "In %s, Get scan result failed! ret = %d",
 				  __func__, get_result_status);
 			break;
 		}
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 		if (scan_id != 0) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: Sending ACS Scan skip event", __func__);
 			sap_signal_hdd_event(sap_ctx, NULL,
 					  eSAP_ACS_SCAN_SUCCESS_EVENT,
 					  (void *) eSAP_STATUS_SUCCESS);
 		} else
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: ACS scan id: %d (skipped ACS SCAN)",
 				  __func__, scan_id);
 #endif
@@ -162,7 +162,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 
 	default:
 		event = eSAP_CHANNEL_SELECTION_FAILED;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, CSR scanStatus = %s (%d)", __func__,
 			  "eCSR_SCAN_ABORT/FAILURE", scan_status);
 	}
@@ -170,7 +170,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 	if (operChannel == SAP_CHANNEL_NOT_SELECTED)
 #ifdef SOFTAP_CHANNEL_RANGE
 	{
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			"%s: No suitable channel selected due to DFS, LTE"
 			"COEX and concurrent mode restrictions", __func__);
 
@@ -199,7 +199,7 @@ QDF_STATUS wlansap_scan_callback(tHalHandle hal_handle,
 	}
 #endif
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Channel selected = %d", __func__,
 		  sap_ctx->channel);
 
@@ -276,7 +276,7 @@ static QDF_STATUS sap_hdd_signal_event_handler(void *ctx)
 	ptSapContext sap_ctx = (struct sSapContext *)ctx;
 	QDF_STATUS status;
 	if (NULL == sap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				FL("sap context is not valid"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -313,7 +313,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
 	if (eCSR_SCAN_SUCCESS != scan_status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("CSR scan_status = eCSR_SCAN_ABORT/FAILURE (%d), choose default channel"),
 			scan_status);
 #ifdef SOFTAP_CHANNEL_RANGE
@@ -328,7 +328,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext,
 		sap_ctx->sap_status = eSAP_STATUS_SUCCESS;
 		goto close_session;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		FL("CSR scan_status = eCSR_SCAN_SUCCESS (%d)"), scan_status);
 	/*
 	* Now do
@@ -346,19 +346,19 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext,
 		* to allow the default channel to be set when reporting to HDD
 		*/
 		oper_channel = SAP_CHANNEL_NOT_SELECTED;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Get scan result failed! ret = %d"),
 		scan_get_result_status);
 	} else {
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 		if (scanid != 0) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("Sending ACS Scan skip event"));
 			sap_signal_hdd_event(sap_ctx, NULL,
 					     eSAP_ACS_SCAN_SUCCESS_EVENT,
 					     (void *) eSAP_STATUS_SUCCESS);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("ACS scanid: %d (skipped ACS SCAN)"),
 				  scanid);
 		}
@@ -369,7 +369,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext,
 
 	if (oper_channel == SAP_CHANNEL_NOT_SELECTED) {
 #ifdef SOFTAP_CHANNEL_RANGE
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL("No suitable channel selected"));
 
 		sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
@@ -398,7 +398,7 @@ wlansap_pre_start_bss_acs_scan_callback(tHalHandle hal_handle, void *pcontext,
 		sap_ctx->channelList = NULL;
 	}
 #endif
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("Channel selected = %d"), sap_ctx->channel);
 	sap_ctx->sap_state = eSAP_ACS_CHANNEL_SELECTED;
 	sap_ctx->sap_status = eSAP_STATUS_SUCCESS;
@@ -407,7 +407,7 @@ close_session:
 			sap_ctx->sessionId, sap_hdd_signal_event_handler,
 			sap_ctx);
 	if (QDF_STATUS_SUCCESS != status)
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("CloseSession failed"));
 	else
 		sap_ctx->isScanSessionOpen = eSAP_FALSE;
@@ -438,7 +438,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 	 * Channel change is successful. If the new channel is a DFS channel,
 	 * then we will to perform channel availability check for 60 seconds
 	 */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 		  FL("sapdfs: changing target channel to [%d]"),
 		  mac_ctx->sap.SapDfsInfo.target_channel);
 	sap_ctx->channel = mac_ctx->sap.SapDfsInfo.target_channel;
@@ -452,7 +452,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 		    && (eSAP_DFS_DO_NOT_SKIP_CAC ==
 			mac_ctx->sap.SapDfsInfo.cac_state)) {
 			sap_ctx->sapsMachine = eSAP_DISCONNECTED;
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  FL("sapdfs: from state eSAP_DISCONNECTING => DISCONNECTED with ignore cac false on sapctx[%p]"),
 				  sap_ctx);
 			/* DFS Channel */
@@ -461,8 +461,8 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 			sap_event.u1 = 0;
 			sap_event.u2 = 0;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO_MED,
 				  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING with ignore cac true on sapctx[%p]"),
 				  sap_ctx);
 
@@ -476,7 +476,7 @@ wlansap_roam_process_ch_change_success(tpAniSirGlobal mac_ctx,
 			sap_event.u2 = eCSR_ROAM_RESULT_INFRA_STARTED;
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs: from state eSAP_DISCONNECTING => eSAP_STARTING on sapctx[%p]"),
 			  sap_ctx);
 		/* non-DFS channel */
@@ -517,8 +517,8 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 	uint8_t dfs_beacon_start_req = 0;
 
 	if (sap_ctx->csr_roamProfile.disableDFSChSwitch) {
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL("sapdfs: DFS channel switch disabled"));
 		/*
 		 * Send a beacon start request to PE. CSA IE required flag from
@@ -537,14 +537,14 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 	 */
 	if (eSAP_STARTED != sap_ctx->sapsMachine) {
 		/* Further actions to be taken here */
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_WARN,
 			  FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"),
 			  sap_ctx->sapsMachine);
 		return;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 		  FL("sapdfs: from state eSAP_STARTED => eSAP_DISCONNECTING"));
 	/* SAP to be moved to DISCONNECTING state */
 	sap_ctx->sapsMachine = eSAP_DISCONNECTING;
@@ -576,8 +576,8 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 		sap_event.params = 0;
 		sap_event.u1 = 0;
 		sap_event.u2 = 0;
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs: Posting event eWNI_SME_CHANNEL_CHANGE_REQ to sapFSM"));
 		/* Handle event */
 		qdf_status = sap_fsm(sap_ctx, &sap_event);
@@ -596,7 +596,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 	 */
 	if (false ==
 	    is_concurrent_sap_ready_for_channel_change(hHal, sap_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs: sapctx[%p] ready but not concurrent sap"),
 			  sap_ctx);
 		*ret_status = QDF_STATUS_SUCCESS;
@@ -611,7 +611,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 			continue;
 
 		pSapContext = mac_ctx->sap.sapCtxList[intf].pSapContext;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs:issue chnl change for sapctx[%p]"),
 			  pSapContext);
 		/* Send channel switch request */
@@ -622,7 +622,7 @@ wlansap_roam_process_dfs_chansw_update_fail(tHalHandle hHal,
 		/* Handle event */
 		qdf_status = sap_fsm(pSapContext, &sap_event);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("post chnl chng req failed, sap[%p]"),
 				  sap_ctx);
 			*ret_status = QDF_STATUS_E_FAILURE;
@@ -652,15 +652,15 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx,
 	tWLAN_SAPEvent sap_event;
 	if (eSAP_DFS_CAC_WAIT == sap_ctx->sapsMachine) {
 		if (sap_ctx->csr_roamProfile.disableDFSChSwitch) {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_ERROR,
 				"sapdfs: DFS channel switch disabled");
 			return;
 		}
 		if (false == mac_ctx->sap.SapDfsInfo.sap_radar_found_status)
 			return;
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs:Posting event eSAP_DFS_CHANNEL_CAC_RADAR_FOUND"));
 		/*
 		 * If Radar is found, while in DFS CAC WAIT State then post stop
@@ -679,7 +679,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx,
 				eSAP_DFS_CAC_INTERRUPTED,
 				(void *) eSAP_STATUS_SUCCESS);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				FL("Failed to send CAC end"));
 			/* Want to still proceed and try to switch channel.
 			 * Lets try not to be on the DFS channel
@@ -697,7 +697,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx,
 		return;
 	}
 	if (eSAP_STARTED == sap_ctx->sapsMachine) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs:Posting event eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START"));
 
 		/*
@@ -715,7 +715,7 @@ wlansap_roam_process_dfs_radar_found(tpAniSirGlobal mac_ctx,
 		return;
 	}
 	/* Further actions to be taken here */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  FL("eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND received in (%d) state\n"),
 		  sap_ctx->sapsMachine);
 
@@ -740,7 +740,7 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx,
 				     QDF_STATUS *ret_status)
 {
 	QDF_STATUS qdf_status;
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_IND (%d)\n"),
 		  roam_result);
 	sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen;
@@ -767,14 +767,14 @@ wlansap_roam_process_infra_assoc_ind(ptSapContext sap_ctx,
 				csr_roam_info, eSAP_STA_ASSOC_IND,
 				(void *) eSAP_STATUS_SUCCESS);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") fail"),
 				  roam_result, MAC_ADDR_ARRAY(
 					csr_roam_info->peerMac.bytes));
 		*ret_status = QDF_STATUS_E_FAILURE;
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 			  FL("CSR roam_result = (%d) MAC ("MAC_ADDRESS_STR") not allowed"),
 			  roam_result,
 			  MAC_ADDR_ARRAY(csr_roam_info->peerMac.bytes));
@@ -812,18 +812,18 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 	uint8_t intf;
 
 	if (NULL == hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid hal"));
 		cdf_ret_status = QDF_STATUS_E_NOMEM;
 		return cdf_ret_status;
 	}
 
 	mac_ctx = PMAC_STRUCT(hal);
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("Before switch on roam_status = %d\n"), roam_status);
 	switch (roam_status) {
 	case eCSR_ROAM_SESSION_OPENED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Calling sme_roam_connect with eCSR_BSS_TYPE_INFRA_AP"));
 		sap_ctx->isSapSessionOpen = eSAP_TRUE;
 		cdf_ret_status = sme_roam_connect(hal, sap_ctx->sessionId,
@@ -831,7 +831,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 						  &sap_ctx->csr_roamId);
 		break;
 	case eCSR_ROAM_INFRA_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_INFRA_IND (%d)\n"),
 			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_INFRA_START_FAILED) {
@@ -847,17 +847,17 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		}
 		break;
 	case eCSR_ROAM_LOSTLINK:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_LOSTLINK (%d)\n"),
 			  roam_status);
 		break;
 	case eCSR_ROAM_MIC_ERROR_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_MIC_ERROR_IND (%d)\n"),
 			  roam_status);
 		break;
 	case eCSR_ROAM_SET_KEY_COMPLETE:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_SET_KEY_COMPLETE (%d)\n"),
 			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_FAILURE)
@@ -866,7 +866,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_ASSOCIATION_COMPLETION:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_ASSOCIATION_COMPLETION (%d)\n"),
 			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_FAILURE)
@@ -875,7 +875,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_DISASSOCIATED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_DISASSOCIATED (%d)\n"),
 			  roam_status);
 		if (roam_result == eCSR_ROAM_RESULT_MIC_FAILURE)
@@ -884,7 +884,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					     (void *) eSAP_STATUS_FAILURE);
 		break;
 	case eCSR_ROAM_WPS_PBC_PROBE_REQ_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_status = eCSR_ROAM_WPS_PBC_PROBE_REQ_IND (%d)\n"),
 			  roam_status);
 		break;
@@ -908,16 +908,16 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_SEND_P2P_STOP_BSS:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Received stopbss"));
 		sap_signal_hdd_event(sap_ctx, csr_roam_info,
 				     eSAP_MAC_TRIG_STOP_BSS_EVENT,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_DFS_RADAR_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Received Radar Indication"));
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs: Indicate eSAP_DFS_RADAR_DETECT to HDD"));
 		sap_signal_hdd_event(sap_ctx, NULL, eSAP_DFS_RADAR_DETECT,
 				     (void *) eSAP_STATUS_SUCCESS);
@@ -953,8 +953,8 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			    NULL) {
 				pSapContext =
 				    mac_ctx->sap.sapCtxList[intf].pSapContext;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sapdfs: no available channel for sapctx[%p], StopBss"),
 					  pSapContext);
 				wlansap_stop_bss(pSapContext);
@@ -962,26 +962,26 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		}
 		break;
 	case eCSR_ROAM_DFS_CHAN_SW_NOTIFY:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Received Chan Sw Update Notification"));
 		break;
 	case eCSR_ROAM_SET_CHANNEL_RSP:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Received set channel response"));
 		break;
 	case eCSR_ROAM_EXT_CHG_CHNL_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("Received set channel Indication"));
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("CSR roam_status not handled roam_status = %s (%d)\n"),
 			  get_e_roam_cmd_status_str(roam_status),
 			  roam_status);
 		break;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("Before switch on roam_result = %d\n"), roam_result);
 
 	switch (roam_result) {
@@ -990,7 +990,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 						csr_roam_info, &cdf_ret_status);
 		break;
 	case eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_ASSOCIATION_CNF (%d)\n"),
 			  roam_result);
 		sap_ctx->nStaWPARSnReqIeLength = csr_roam_info->rsnIELen;
@@ -1015,7 +1015,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_DISASSOC_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_DISASSOC_IND (%d)\n"),
 			  roam_result);
 		/* Fill in the event structure */
@@ -1026,7 +1026,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_DEAUTH_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_DEAUTH_IND (%d)\n"),
 			  roam_result);
 		/*
@@ -1041,7 +1041,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_GROUP:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_GROUP (%d)\n"),
 			  roam_result);
 		/*
@@ -1055,7 +1055,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_MIC_ERROR_UNICAST:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_MIC_ERROR_UNICAST (%d)\n"),
 			  roam_result);
 		/*
@@ -1071,7 +1071,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 		}
 		break;
 	case eCSR_ROAM_RESULT_AUTHENTICATED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_AUTHENTICATED (%d)\n"),
 			  roam_result);
 		/* Fill in the event structure */
@@ -1082,7 +1082,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_ASSOCIATED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_ASSOCIATED (%d)\n"),
 			  roam_result);
 		/* Fill in the event structure */
@@ -1091,7 +1091,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_RESULT_INFRA_STARTED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STARTED (%d)\n"),
 			  roam_result);
 		/*
@@ -1109,7 +1109,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_INFRA_STOPPED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_INFRA_STOPPED (%d)\n"),
 			  roam_result);
 		/* Fill in the event structure */
@@ -1123,7 +1123,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_WPS_PBC_PROBE_REQ_IND (%d)\n"),
 			  roam_result);
 		/*
@@ -1137,7 +1137,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	case eCSR_ROAM_RESULT_FORCED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_FORCED (%d)\n"),
 			  roam_result);
 		/*
@@ -1150,7 +1150,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 				     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_RESULT_NONE:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_NONE (%d)\n"),
 			  roam_result);
 		/*
@@ -1164,7 +1164,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 					     (void *) eSAP_STATUS_SUCCESS);
 		break;
 	case eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("CSR roam_result = eCSR_ROAM_RESULT_MAX_ASSOC_EXCEEDED (%d)\n"),
 			  roam_result);
 		/* Fill in the event structure */
@@ -1204,7 +1204,7 @@ wlansap_roam_callback(void *ctx, tCsrRoamInfo *csr_roam_info, uint32_t roamId,
 			cdf_ret_status = QDF_STATUS_E_FAILURE;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("CSR roam_result = %s (%d) not handled\n"),
 			  get_e_csr_roam_result_str(roam_result),
 			  roam_result);
diff --git a/core/sap/src/sap_ch_select.c b/core/sap/src/sap_ch_select.c
index 8bad4308903b..41f4c63031e4 100644
--- a/core/sap/src/sap_ch_select.c
+++ b/core/sap/src/sap_ch_select.c
@@ -41,7 +41,7 @@
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "csr_api.h"
 #include "sme_api.h"
 #include "sap_ch_select.h"
@@ -358,8 +358,8 @@ void sap_process_avoid_ie(tHalHandle hal,
 				continue;
 
 			sap_ctx->sap_detected_avoid_ch_ie.present = 1;
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_DEBUG,
 				  "Q2Q IE - avoid ch %d",
 				  avoid_ch_ie->channel);
 			/* add this channel to to_avoid channel list */
@@ -425,8 +425,8 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx)
 		if (pSapCtx->dfs_ch_disable == true) {
 			if (CDS_IS_DFS_CH(safe_channels[i].channelNumber)) {
 				safe_channels[i].isSafe = false;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_INFO_HIGH,
 					"%s: DFS Ch %d is not safe in"
 					" Concurrent mode",
 					__func__,
@@ -446,8 +446,8 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx)
 			    unsafe_channel_list[i]) {
 				/* Found unsafe channel, update it */
 				safe_channels[j].isSafe = false;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("CH %d is not safe"),
 					  unsafe_channel_list[i]);
 				break;
@@ -460,7 +460,7 @@ void sap_update_unsafe_channel_list(ptSapContext pSapCtx)
 #else
 void sap_update_unsafe_channel_list(ptSapContext pSapCtx)
 {
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not implemented", __func__);
 	return;
 }
@@ -490,18 +490,18 @@ void sap_cleanup_channel_list(void *p_cds_gctx)
 {
 	ptSapContext pSapCtx;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "Cleaning up the channel list structure");
 
 	if (NULL == p_cds_gctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  "SAP Global Context is NULL");
 		return;
 	}
 
 	pSapCtx = CDS_GET_SAP_CB(p_cds_gctx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  "SAP Context is NULL");
 		return;
 	}
@@ -552,8 +552,8 @@ uint8_t sap_select_preferred_channel_from_channel_list(uint8_t best_chnl,
 	/* Select the best channel from allowed list */
 	for (i = 0; i < sap_ctx->acs_cfg->ch_list_count; i++) {
 		if (sap_ctx->acs_cfg->ch_list[i] == best_chnl) {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO_HIGH,
 				"Best channel is: %d",
 				best_chnl);
 			return best_chnl;
@@ -599,7 +599,7 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 	uint32_t dfs_master_cap_enabled;
 	bool include_dfs_ch = true;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s",
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s",
 		  __func__);
 
 	pSpectInfoParams->numSpectChans =
@@ -611,7 +611,7 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 						   * sizeof(*pSpectCh));
 
 	if (pSpectCh == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s, CDF_MALLOC_ERR", __func__);
 		return eSAP_FALSE;
 	}
@@ -642,7 +642,7 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 		/* check if the channel is in NOL blacklist */
 		if (sap_dfs_is_channel_in_nol_list(pSapCtx, *pChans,
 						   PHY_SINGLE_CHANNEL_CENTERED)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "In %s, Ch %d is in NOL list", __func__,
 				  *pChans);
 			chSafe = false;
@@ -652,8 +652,8 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 		if (include_dfs_ch == false) {
 			if (CDS_IS_DFS_CH(*pChans)) {
 				chSafe = false;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "In %s, DFS Ch %d not considered for ACS",
 					  __func__, *pChans);
 				continue;
@@ -664,8 +664,8 @@ bool sap_chan_sel_init(tHalHandle halHandle,
 		for (i = 0; i < NUM_20MHZ_RF_CHANNELS; i++) {
 			if ((safe_channels[i].channelNumber == *pChans) &&
 			    (false == safe_channels[i].isSafe)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "In %s, Ch %d is not safe", __func__,
 					  *pChans);
 				chSafe = false;
@@ -735,7 +735,7 @@ uint32_t sapweight_rssi_count(int8_t rssi, uint16_t count)
 
 	rssicountWeight = rssiWeight + countWeight;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, rssiWeight=%d, countWeight=%d, rssicountWeight=%d",
 		  __func__, rssiWeight, countWeight, rssicountWeight);
 
@@ -837,7 +837,7 @@ void sap_upd_chan_spec_params(tSirProbeRespBeacon *pBeaconStruct,
 			      uint16_t *centerFreq_2)
 {
 	if (NULL == pBeaconStruct) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("pBeaconStruct is NULL"));
 		return;
 	}
@@ -924,7 +924,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch,
 	uint16_t num_ch;
 	int32_t offset = 0;
 	if (NULL == spect_ch) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("spect_ch is NULL"));
 		return;
 	}
@@ -1006,7 +1006,7 @@ void sap_interference_rssi_count_5G(tSapSpectChInfo *spect_ch,
 void sap_interference_rssi_count(tSapSpectChInfo *spect_ch)
 {
 	if (NULL == spect_ch) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: spect_ch is NULL", __func__);
 		return;
 	}
@@ -1170,11 +1170,11 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 
 	pBeaconStruct = cdf_mem_malloc(sizeof(tSirProbeRespBeacon));
 	if (NULL == pBeaconStruct) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "Unable to allocate memory in sap_compute_spect_weight\n");
 		return;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Computing spectral weight", __func__);
 
 	/**
@@ -1262,8 +1262,8 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 					break;
 				}
 
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "In %s, bssdes.ch_self=%d, bssdes.ch_ID=%d, bssdes.rssi=%d, SpectCh.bssCount=%d, pScanResult=%p, ChannelWidth %d, secondaryChanOffset %d, center frequency %d \n",
 					  __func__,
 					  pScanResult->BssDescriptor.
@@ -1286,7 +1286,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 	/* Calculate the weights for all channels in the spectrum pSpectCh */
 	pSpectCh = pSpectInfoParams->pSpectCh;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Spectrum Channels Weight", __func__);
 
 	for (chn_num = 0; chn_num < (pSpectInfoParams->numSpectChans);
@@ -1308,7 +1308,7 @@ void sap_compute_spect_weight(tSapChSelSpectInfo *pSpectInfoParams,
 		pSpectCh->weight_copy = pSpectCh->weight;
 
 		/* ------ Debug Info ------ */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Chan=%d Weight= %d rssiAgr=%d bssCount=%d",
 			  __func__, pSpectCh->chNum, pSpectCh->weight,
 			  pSpectCh->rssiAgr, pSpectCh->bssCount);
@@ -1480,7 +1480,7 @@ void sap_sort_chl_weight_ht80(tSapChSelSpectInfo *pSpectInfoParams)
 
 	pSpectInfo = pSpectInfoParams->pSpectCh;
 	for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Channel=%d Weight= %d rssi=%d bssCount=%d"),
 			pSpectInfo->chNum, pSpectInfo->weight,
 			pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1617,7 +1617,7 @@ void sap_sort_chl_weight_vht160(tSapChSelSpectInfo *pSpectInfoParams)
 
 	pSpectInfo = pSpectInfoParams->pSpectCh;
 	for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Channel=%d Weight= %d rssi=%d bssCount=%d"),
 			pSpectInfo->chNum, pSpectInfo->weight,
 			pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1794,7 +1794,7 @@ void sap_sort_chl_weight_ht40_5_g(tSapChSelSpectInfo *pSpectInfoParams)
 
 	pSpectInfo = pSpectInfoParams->pSpectCh;
 	for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d",
 			  __func__, pSpectInfo->chNum, pSpectInfo->weight,
 			  pSpectInfo->rssiAgr, pSpectInfo->bssCount);
@@ -1885,11 +1885,11 @@ void sap_sort_chl_weight_all(ptSapContext pSapCtx,
 #endif
 
 	/* For testing */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Sorted Spectrum Channels Weight", __func__);
 	pSpectCh = pSpectInfoParams->pSpectCh;
 	for (j = 0; j < (pSpectInfoParams->numSpectChans); j++) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Channel=%d Weight= %d rssi=%d bssCount=%d",
 			  __func__, pSpectCh->chNum, pSpectCh->weight,
 			  pSpectCh->rssiAgr, pSpectCh->bssCount);
@@ -1969,7 +1969,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 	uint32_t tmpChNum;
 	uint8_t count;
 #endif
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "In %s, Running SAP Ch Select", __func__);
 
 #ifdef FEATURE_WLAN_CH_AVOID
@@ -1977,7 +1977,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 #endif
 
 	if (NULL == pScanResult) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: No external AP present\n", __func__);
 
 #ifndef SOFTAP_CHANNEL_RANGE
@@ -1987,7 +1987,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 		endChannelNum = pSapCtx->acs_cfg->end_ch;
 
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: start - end: %d - %d\n", __func__,
 			  startChannelNum, endChannelNum);
 
@@ -2025,8 +2025,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 					continue;
 
 				if (safe_channels[i].isSafe == true) {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_INFO_HIGH,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_INFO_HIGH,
 						  "%s: channel %d in the configuration is safe\n",
 						  __func__,
 						  safe_channels[i].
@@ -2036,8 +2036,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 					break;
 				}
 
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: channel %d in the configuration is unsafe\n",
 					  __func__,
 					  safe_channels[i].channelNumber);
@@ -2052,7 +2052,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 
 	/* Initialize the structure pointed by pSpectInfoParams */
 	if (sap_chan_sel_init(halHandle, pSpectInfoParams, pSapCtx) != eSAP_TRUE) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s, Ch Select initialization failed", __func__);
 		return SAP_CHANNEL_NOT_SELECTED;
 	}
@@ -2171,8 +2171,8 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 				continue;
 #endif
 			bestChNum = pSpectInfoParams->pSpectCh[count].chNum;
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_INFO_HIGH,
 					"change best channel to %d in PCL",
 					bestChNum);
 			break;
@@ -2218,7 +2218,7 @@ uint8_t sap_select_channel(tHalHandle halHandle, ptSapContext pSapCtx,
 	/* Free all the allocated memory */
 	sap_chan_sel_exit(pSpectInfoParams);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		"In %s, Running SAP Ch select Completed, Ch=%d", __func__,
 		bestChNum);
 	if (bestChNum > 0 && bestChNum <= 252)
diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index 20bcc6ad14af..f2ce213ccb93 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -976,7 +976,7 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx,
 			/* not present in NOL */
 			continue;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 			FL("sapdfs: processing NOL channel: %d"),
 			dfs_nol_channel);
 		if (false == sap_find_target_channel_in_channel_matrix(
@@ -986,9 +986,9 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx,
 			 * should never happen, we should always find a table
 			 * here, if we don't, need a fix here!
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("Couldn't find target channel matrix!"));
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 		/*
@@ -1016,8 +1016,8 @@ sap_mark_channels_leaking_into_nol(ptSapContext sap_ctx,
 				 * bad leakage in NOL channel,
 				 * remove from temp list
 				 */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_INFO_LOW,
 					FL("sapdfs: channel: %d will have bad leakage due to channel: %d\n"),
 					dfs_nol_channel, temp_ch_lst[j]);
 				temp_ch_lst[j] = 0;
@@ -1051,7 +1051,7 @@ static void sap_set_bitmap(chan_bonding_bitmap *pBitmap, uint8_t channel)
 			return;
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  FL("Channel=%d is not in the bitmap"), channel);
 }
 
@@ -1106,7 +1106,7 @@ static uint8_t sap_populate_available_channels(chan_bonding_bitmap *bitmap,
 		}
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid case."));
 		break;
 	}
@@ -1136,7 +1136,7 @@ bool sap_dfs_is_w53_invalid(tHalHandle hHal, uint8_t channelID)
 
 	pMac = PMAC_STRUCT(hHal);
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid pMac"));
 		return false;
 	}
@@ -1174,14 +1174,14 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID
 
 	pMac = PMAC_STRUCT(hHal);
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid pMac"));
 		return true;
 	}
 	if ((SAP_CHAN_PREFERRED_INDOOR ==
 	     pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location) &&
 	    (true == IS_CHAN_JAPAN_OUTDOOR(channelID))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 			  FL
 				  ("CHAN=%d is Outdoor so invalid,preferred Indoor only"),
 			  channelID);
@@ -1189,7 +1189,7 @@ bool sap_dfs_is_channel_in_preferred_location(tHalHandle hHal, uint8_t channelID
 	} else if ((SAP_CHAN_PREFERRED_OUTDOOR ==
 		    pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location)
 		   && (true == IS_CHAN_JAPAN_INDOOR(channelID))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 			  FL
 				  ("CHAN=%d is Indoor so invalid,preferred Outdoor only"),
 			  channelID);
@@ -1251,14 +1251,14 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 	uint8_t   dfs_region;
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid hHal"));
 		return target_channel;
 	}
 
 	pMac = PMAC_STRUCT(hHal);
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid pMac"));
 		return target_channel;
 	}
@@ -1277,7 +1277,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 	}
 
 	if (sap_get5_g_hz_channel_list(sapContext)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 			  FL("Getting 5Ghz channel list failed"));
 		return target_channel;
 	}
@@ -1315,8 +1315,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 			 * Check for JAPAN W53 Channel operation capability
 			 */
 			if (true == sap_dfs_is_w53_invalid(hHal, channelID)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  FL
 					  ("index:%d, Channel=%d Invalid,Japan W53 Disabled"),
 					  i, channelID);
@@ -1336,8 +1336,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 			if (false ==
 			    sap_dfs_is_channel_in_preferred_location(hHal,
 								channelID)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  FL
 					  ("CHAN=%d is invalid,preferred Channel Location %d Only"),
 					  channelID,
@@ -1361,8 +1361,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 				 * Mark this channel invalid since it is still
 				 * in DFS Non-Occupancy-Period which is 30 mins.
 				 */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  FL
 					  ("index: %d, Channel = %d Present in NOL LIST"),
 					  i, channelID);
@@ -1378,8 +1378,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 		if (pMac->sap.sap_channel_avoidance
 		    && sapContext->sap_detected_avoid_ch_ie.present) {
 			if (sap_check_in_avoid_ch_list(sapContext, channelID)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  FL("index: %d, Channel = %d, avoided due to presence of another AP+AP MCC device in same channel."),
 					  i, channelID);
 				sapContext->SapAllChnlList.channelList[i].
@@ -1395,7 +1395,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 			 * mark this channel invalid since it is out of ACS
 			 * channel range
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 				  FL
 				  ("index: %d, Channel = %d out of ACS channel range"),
 				  i, channelID);
@@ -1408,7 +1408,7 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 	/* valid_chnl_count now have number of valid channels */
 	tmp_ch_lst = cdf_mem_malloc(valid_chnl_count);
 	if (tmp_ch_lst == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("sapdfs: memory alloc failed"));
 		return target_channel;
 	}
@@ -1422,8 +1422,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 		/* prepare temp list of just the valid channels */
 		for (i = 0; i < sapContext->SapAllChnlList.numChannel; i++) {
 			if (sapContext->SapAllChnlList.channelList[i].valid) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL
 					  ("sapdfs: Adding Channel = %d to temp List"),
 					  sapContext->SapAllChnlList.
@@ -1434,8 +1434,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 		}
 
 #ifdef WLAN_ENABLE_CHNL_MATRIX_RESTRICTION
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL
 			  ("sapdfs: Processing temp channel list against NOL.")
 			  );
@@ -1458,8 +1458,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 		channelBitmap.chanBondingSet[3].startChannel = 132;
 		channelBitmap.chanBondingSet[4].startChannel = 149;
 		/* now loop through whatever is left of channel list */
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL("sapdfs: Moving temp channel list to final."));
 		for (i = 0; i < valid_chnl_count; i++) {
 			/*
@@ -1467,8 +1467,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 			 * channel list (in case of 20MHz width)
 			 */
 			if (tmp_ch_lst[i] != 0) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_DEBUG,
 					  FL("sapdfs: processing channel: %d "),
 					  tmp_ch_lst[i]);
 				/*
@@ -1476,16 +1476,16 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 				 * channel list
 				 */
 				if (ch_width == CH_WIDTH_20MHZ) {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_DEBUG,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_DEBUG,
 						  FL
 						  ("sapdfs: Channel=%d added to available list"),
 						  tmp_ch_lst[i]);
 					availableChannels[available_ch_cnt++] =
 						tmp_ch_lst[i];
 				} else {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_DEBUG,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_DEBUG,
 						  FL("sapdfs: Channel=%d added to bitmap"),
 						  tmp_ch_lst[i]);
 					sap_set_bitmap(&channelBitmap,
@@ -1509,12 +1509,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 			 */
 			if (available_ch_cnt == 0) {
 				if (ch_width == CH_WIDTH_80MHZ) {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_WARN,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_WARN,
 						  FL
 						  ("sapdfs:No 80MHz cb found, falling to 40MHz"));
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_WARN,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_WARN,
 						  FL
 						  ("sapdfs:Changing chanWidth from [%d] to [%d]"),
 						  ch_width,
@@ -1523,12 +1523,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 					/* continue to start of do loop */
 					continue;
 				} else if (ch_width == CH_WIDTH_40MHZ) {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_WARN,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_WARN,
 						  FL
 						  ("sapdfs:No 40MHz cb found, falling to 20MHz"));
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_WARN,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_WARN,
 						  FL
 						  ("sapdfs:Changing chanWidth from [%d] to [%d]"),
 						  ch_width,
@@ -1557,8 +1557,8 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 				}
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_INFO_LOW,
 					FL("No target channel found"));
 		}
 
@@ -1580,12 +1580,12 @@ static uint8_t sap_random_channel_sel(ptSapContext sapContext)
 		}
 
 		pMac->sap.SapDfsInfo.new_chanWidth = ch_width;
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO_LOW,
 				FL("sapdfs: New Channel width = %d"),
 				pMac->sap.SapDfsInfo.new_chanWidth);
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO_LOW,
 				FL("sapdfs: target_channel = %d"),
 				target_channel);
 		break;
@@ -1639,13 +1639,13 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels,
 	if (NULL == channels)
 		return;
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid hHal"));
 		return;
 	}
 	pMac = PMAC_STRUCT(hHal);
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid pMac"));
 		return;
 	}
@@ -1670,8 +1670,8 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels,
 			 */
 			if (psapDfsChannelNolList[j].radar_status_flag ==
 					eSAP_DFS_CHANNEL_UNAVAILABLE) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-						CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+						QDF_TRACE_LEVEL_INFO_HIGH,
 						FL("Channel=%d already in NOL"),
 						channels[i]);
 				continue;
@@ -1685,8 +1685,8 @@ void sap_mark_dfs_channels(ptSapContext sapContext, uint8_t *channels,
 			psapDfsChannelNolList[j].radar_status_flag =
 				eSAP_DFS_CHANNEL_UNAVAILABLE;
 
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("Channel=%d Added to NOL LIST"),
 				channels[i]);
 		}
@@ -1716,7 +1716,7 @@ uint8_t sap_get_bonding_channels(ptSapContext sapContext, uint8_t channel,
 	} else
 		return 0;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  FL("cbmode: %d, channel: %d"), chanBondState, channel);
 
 	switch (chanBondState) {
@@ -1797,7 +1797,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol)
 		 * SAP operation since it is past
 		 * Non-Occupancy-Period so, return false.
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 			  FL("Chan=%d not in NOL,CHAN AVAILABLE"),
 			  nol->dfs_channel_number);
 		return true;
@@ -1830,7 +1830,7 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol)
 			nol->radar_status_flag = eSAP_DFS_CHANNEL_AVAILABLE;
 			nol->radar_found_timestamp = 0;
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 				  FL("Chan=%d not in NOL, Channel AVAILABLE"),
 				  nol->dfs_channel_number);
 			return true;
@@ -1841,13 +1841,13 @@ static bool sap_dfs_check_if_channel_avaialable(tSapDfsNolInfo *nol)
 			 * Channel is still in
 			 * Non-occupancy-Period.
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 				  FL("Chan=%d in NOL, Channel UNAVAILBLE"),
 				  nol->dfs_channel_number);
 			return false;
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid Radar Status Flag"));
 	}
 	return true;
@@ -1879,7 +1879,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context,
 	bool channel_available;
 
 	if (NULL == h_hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("invalid h_hal"));
 		return false;
 	} else {
@@ -1890,7 +1890,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context,
 	if ((dfs_info->numCurrentRegDomainDfsChannels == 0) ||
 	    (dfs_info->numCurrentRegDomainDfsChannels >
 	     NUM_5GHZ_CHANNELS)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 			  FL("invalid dfs channel count %d"),
 			  dfs_info->numCurrentRegDomainDfsChannels);
 		return false;
@@ -1927,7 +1927,7 @@ sap_dfs_is_channel_in_nol_list(ptSapContext sap_context,
 	if (j < num_channels &&
 	    i < dfs_info->numCurrentRegDomainDfsChannels) {
 		if (num_channels > MAX_BONDED_CHANNELS) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 				  FL("num_channel>MAX_BONDED_CHANNEL, reset"));
 			num_channels = MAX_BONDED_CHANNELS;
 		}
@@ -1977,7 +1977,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 	h_hal = cds_get_context(QDF_MODULE_ID_SME);
 	if (NULL == h_hal) {
 		/* we have a serious problem */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  FL("invalid h_hal"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1990,7 +1990,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 			sap_context->dfs_ch_disable = true;
 		} else if (con_ch && sap_context->channel != con_ch &&
 			   CDS_IS_DFS_CH(sap_context->channel)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 				  FL("MCC DFS not supported in AP_AP Mode"));
 			return QDF_STATUS_E_ABORTED;
 		}
@@ -2003,8 +2003,8 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 					sap_context->csr_roamProfile.phyMode,
 					sap_context->cc_switch_mode);
 			if (con_ch) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_ERROR,
 					"%s: Override ch %d to %d due to CC Intf",
 					__func__, sap_context->channel, con_ch);
 				sap_context->channel = con_ch;
@@ -2018,7 +2018,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 		if (sap_context->channel == AUTO_CHANNEL_SELECT)
 			sap_context->dfs_ch_disable = true;
 		else if (CDS_IS_DFS_CH(sap_context->channel)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 				  FL("DFS not supported in STA_AP Mode"));
 			return QDF_STATUS_E_ABORTED;
 		}
@@ -2031,8 +2031,8 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 					sap_context->csr_roamProfile.phyMode,
 					sap_context->cc_switch_mode);
 			if (con_ch && !CDS_IS_DFS_CH(con_ch)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_ERROR,
 					"%s: Override ch %d to %d due to CC Intf",
 					__func__, sap_context->channel, con_ch);
 				sap_context->channel = con_ch;
@@ -2043,7 +2043,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 
 	if (sap_context->channel == AUTO_CHANNEL_SELECT) {
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("%s skip_acs_status = %d "), __func__,
 			  sap_context->acs_cfg->skip_scan_status);
 		if (sap_context->acs_cfg->skip_scan_status !=
@@ -2095,7 +2095,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 #endif
 		/* Set requestType to Full scan */
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("calling sme_scan_request"));
 #ifdef FEATURE_WLAN_AP_AP_ACS_OPTIMIZE
 		if (sap_context->acs_cfg->skip_scan_status ==
@@ -2128,10 +2128,10 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 				sap_context);
 		}
 		if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("sme_scan_request  fail %d!!!"),
 				  cdf_ret_status);
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("SAP Configuring default channel, Ch=%d"),
 				  sap_context->channel);
 			/* In case of error, switch to default channel */
@@ -2160,7 +2160,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 				qdf_status = sap_fsm(sap_context, sap_event);
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				 FL("return sme_ScanReq, scanID=%d, Ch=%d"),
 				 scan_request.scan_id, sap_context->channel);
 		}
@@ -2171,18 +2171,18 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 	}
 
 	if (sap_context->acs_cfg->skip_scan_status == eSAP_SKIP_ACS_SCAN) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("## %s SKIPPED ACS SCAN"), __func__);
 		wlansap_scan_callback(h_hal, sap_context,
 			sap_context->sessionId, 0, eCSR_SCAN_SUCCESS);
 	}
 #endif
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("for configured channel, Ch= %d"),
 			  sap_context->channel);
 		if (sap_do_acs_pre_start_bss == true) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				FL("ACS end due to Ch override. Sel Ch = %d"),
 							sap_context->channel);
 			sap_context->acs_cfg->pri_ch = sap_context->channel;
@@ -2209,7 +2209,7 @@ QDF_STATUS sap_goto_channel_sel(ptSapContext sap_context,
 	 * Have to wait for the call back to be called to get the
 	 * channel cannot advance state machine here as said above
 	 */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("before exiting sap_goto_channel_sel channel=%d"),
 		  sap_context->channel);
 
@@ -2251,7 +2251,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext)
 		status = cds_get_vdev_types(QDF_SAP_MODE, &type, &subType);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  "failed to get vdev type");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2263,7 +2263,7 @@ QDF_STATUS sap_open_session(tHalHandle hHal, ptSapContext sapContext)
 					  &sapContext->sessionId, type, subType);
 
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sme_roam_connect status = %d",
 			  __func__, cdf_ret_status);
 
@@ -2317,12 +2317,12 @@ sap_goto_starting
 	sapContext->key_length = 32;
 	cdf_mem_copy(sapContext->key_material, key_material, sizeof(key_material));     /* Need a key size define */
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "In %s",
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "In %s",
 		  __func__);
 
 	if (NULL == hHal) {
 		/* we have a serious problem */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  "In %s, invalid hHal", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2330,7 +2330,7 @@ sap_goto_starting
 	cdf_ret_status = sap_open_session(hHal, sapContext);
 
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sap_open_session status = %d",
 			  __func__, cdf_ret_status);
 		return QDF_STATUS_E_FAILURE;
@@ -2369,7 +2369,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext)
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
 		/* we have a serious problem */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s, invalid hHal", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2377,7 +2377,7 @@ QDF_STATUS sap_goto_disconnecting(ptSapContext sapContext)
 	sap_free_roam_profile(&sapContext->csr_roamProfile);
 	cdf_ret_status = sme_roam_stop_bss(hHal, sapContext->sessionId);
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Error: In %s calling sme_roam_stop_bss status = %d",
 			  __func__, cdf_ret_status);
 		return QDF_STATUS_E_FAILURE;
@@ -2463,22 +2463,22 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx,
 
 	/* Format the Start BSS Complete event to return... */
 	if (NULL == sap_ctx->pfnSapEventCallback) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (NULL == hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid hal"));
 		return QDF_STATUS_E_FAILURE;
 	}
 	mac_ctx = PMAC_STRUCT(hal);
 	if (NULL == mac_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid MAC context"));
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("SAP event callback event = %s"),
 		  sap_hdd_event_to_string(sap_hddevent));
 
@@ -2517,7 +2517,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx,
 		else
 			bss_complete->staId = 0;
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("(eSAP_START_BSS_EVENT): staId = %d"),
 			  bss_complete->staId);
 
@@ -2750,7 +2750,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx,
 			(&mac_ctx->sap.SapDfsInfo.sapDfsChannelNolList[0]);
 		break;
 	case eSAP_ECSA_CHANGE_CHAN_IND:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				"In %s, SAP event callback event = %s",
 				__func__, "eSAP_ECSA_CHANGE_CHAN_IND");
 		sap_ap_event.sapHddEventCode = eSAP_ECSA_CHANGE_CHAN_IND;
@@ -2758,7 +2758,7 @@ QDF_STATUS sap_signal_hdd_event(ptSapContext sap_ctx,
 					   csr_roaminfo->target_channel;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("SAP Unknown callback event = %d"),
 			  sap_hddevent);
 		break;
@@ -2849,7 +2849,7 @@ QDF_STATUS sap_close_session(tHalHandle hHal,
 
 	if (NULL == sap_find_valid_concurrent_session(hHal)) {
 		/* If timer is running then stop the timer and destory it */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  "sapdfs: no session are valid, so clearing dfs global structure");
 		/*
 		 * CAC timer will be initiated and started only when SAP starts
@@ -2930,7 +2930,7 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal)
 		    (QDF_P2P_GO_MODE == pMac->sap.sapCtxList[intf].sapPersona))
 		    && pMac->sap.sapCtxList[intf].pSapContext != NULL &&
 		    (false == pSapContext->isCacStartNotified)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Signaling eSAP_DFS_CAC_START to HDD for sapctx[%p]",
 				  pSapContext);
 
@@ -2939,8 +2939,8 @@ QDF_STATUS sap_cac_start_notify(tHalHandle hHal)
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
 			if (QDF_STATUS_SUCCESS != qdf_status) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "In %s, failed setting isCacStartNotified on interface[%d]",
 					  __func__, intf);
 				return qdf_status;
@@ -2990,15 +2990,15 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo)
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
 			if (QDF_STATUS_SUCCESS != qdf_status) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "In %s, failed setting isCacEndNotified on interface[%d]",
 					  __func__, intf);
 				return qdf_status;
 			}
 			pSapContext->isCacEndNotified = true;
 			pMac->sap.SapDfsInfo.sap_radar_found_status = false;
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Start beacon request on sapctx[%p]",
 				  pSapContext);
 
@@ -3008,7 +3008,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo)
 			/* Transition from eSAP_STARTING to eSAP_STARTED
 			 * (both without substates)
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: channel[%d] from state %s => %s",
 				  pSapContext->channel, "eSAP_STARTING",
 				  "eSAP_STARTED");
@@ -3021,8 +3021,8 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo)
 							  (void *)
 							  eSAP_STATUS_SUCCESS);
 			if (QDF_STATUS_SUCCESS != qdf_status) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "In %s, failed setting isCacEndNotified on interface[%d]",
 					  __func__, intf);
 				return qdf_status;
@@ -3031,7 +3031,7 @@ QDF_STATUS sap_cac_end_notify(tHalHandle hHal, tCsrRoamInfo *roamInfo)
 			/* Transition from eSAP_STARTING to eSAP_STARTED
 			 * (both without substates)
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "In %s, from state %s => %s",
 				  __func__, "eSAP_DFS_CAC_WAIT",
 				  "eSAP_STARTED");
@@ -3072,13 +3072,13 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx,
 		 * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("new from state %s => %s"),
 			  "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
 
 		/* There can be one SAP Session for softap */
 		if (sap_ctx->isSapSessionOpen == eSAP_TRUE) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 				  FL("SME Session is already opened"));
 			return QDF_STATUS_E_EXISTS;
 		}
@@ -3095,8 +3095,8 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx,
 					    sap_ctx, sap_ctx->self_mac_addr,
 					    &sap_ctx->sessionId, type, subtype);
 				if (QDF_STATUS_SUCCESS != qdf_status) {
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						  QDF_TRACE_LEVEL_ERROR,
 						  FL("Error: calling sme_open_session"));
 				} else {
 					sap_ctx->isScanSessionOpen = eSAP_TRUE;
@@ -3119,7 +3119,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx,
 		 * Transition from eSAP_DISCONNECTED to eSAP_CH_SELECT
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_DISCONNECTED", "eSAP_CH_SELECT");
 	} else if (msg == eSAP_DFS_CHANNEL_CAC_START) {
@@ -3129,10 +3129,10 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx,
 		 */
 		sap_ctx->sapsMachine = eSAP_DFS_CAC_WAIT;
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			FL("from state eSAP_DISCONNECTED => SAP_DFS_CAC_WAIT"));
 		if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			    FL("sapdfs: starting dfs cac timer on sapctx[%p]"),
 			    sap_ctx);
 			sap_start_dfs_cac_timer(sap_ctx);
@@ -3149,7 +3149,7 @@ static QDF_STATUS sap_fsm_state_disconnected(ptSapContext sap_ctx,
 		 */
 		qdf_status = sap_goto_channel_sel(sap_ctx, sap_event, false);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, event msg %d"),
 			  "eSAP_DISCONNECTED", msg);
 	}
@@ -3186,7 +3186,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 		qdf_status = sme_close_session(hal, sap_ctx->sessionId,
 				NULL, NULL);
 		if (QDF_STATUS_SUCCESS != qdf_status)
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				FL("CloseSession error event msg %d"), msg);
 		else
 			sap_ctx->isScanSessionOpen = eSAP_FALSE;
@@ -3227,8 +3227,8 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 			ch = sap_random_channel_sel(sap_ctx);
 			if (ch == 0) {
 				/* No available channel found */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_ERROR,
 					FL("No available channel found!!!"));
 				sap_signal_hdd_event(sap_ctx, NULL,
 					eSAP_DFS_NO_AVAILABLE_CHANNEL,
@@ -3236,7 +3236,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 				return QDF_STATUS_E_FAULT;
 			}
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("channel %d is in NOL, StartBss on new channel %d"),
 				  sap_ctx->channel, ch);
 
@@ -3269,7 +3269,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 		 * Transition from eSAP_CH_SELECT to eSAP_STARTING
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_CH_SELECT", "eSAP_STARTING");
 		/* Channel selected. Now can sap_goto_starting */
@@ -3289,7 +3289,7 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 				sap_ctx->ch_params.center_freq_seg1;
 		sap_ctx->csr_roamProfile.ch_params.sec_ch_offset =
 				sap_ctx->ch_params.sec_ch_offset;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		    FL("notify hostapd about channel selection: %d"),
 		    sap_ctx->channel);
 		sap_signal_hdd_event(sap_ctx, NULL,
@@ -3299,16 +3299,16 @@ static QDF_STATUS sap_fsm_state_ch_select(ptSapContext sap_ctx,
 					  eCSR_BSS_TYPE_INFRA_AP);
 	} else if (msg == eSAP_CHANNEL_SELECTION_FAILED) {
 		sap_ctx->sapsMachine = eSAP_DISCONNECTED;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		FL("Cannot start BSS, ACS Fail"));
 	} else if (msg == eSAP_HDD_STOP_INFRA_BSS) {
 		sap_ctx->sapsMachine = eSAP_DISCONNECTED;
 		sap_signal_hdd_event(sap_ctx, NULL, eSAP_START_BSS_EVENT,
 					(void *)eSAP_STATUS_FAILURE);
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			"%s: BSS stopped when Ch select in Progress", __func__);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
 			  "eSAP_CH_SELECT", msg);
 	}
@@ -3336,7 +3336,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 
 	if (msg == eSAP_DFS_CHANNEL_CAC_START) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_CH_SELECT", "eSAP_DFS_CAC_WAIT");
 		if (mac_ctx->sap.SapDfsInfo.is_dfs_cac_timer_running != true)
@@ -3349,7 +3349,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 		 * check, need to switch the channel again
 		 */
 		eCsrPhyMode phymode = sap_ctx->csr_roamProfile.phyMode;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "ENTERTRED CAC WAIT STATE-->eSAP_DISCONNECTING\n");
 		if (mac_ctx->sap.SapDfsInfo.target_channel) {
 			sme_set_ch_params(hal, phymode,
@@ -3389,7 +3389,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 		qdf_status = sap_cac_end_notify(hal, roam_info);
 	} else if (msg == eSAP_HDD_STOP_INFRA_BSS) {
 		/* Transition from eSAP_DFS_CAC_WAIT to eSAP_DISCONNECTING */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_DFS_CAC_WAIT", "eSAP_DISCONNECTING");
 
@@ -3400,8 +3400,8 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 		 *               all APs are down.
 		 */
 		if (NULL == sap_find_valid_concurrent_session(hal)) {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO_MED,
 				  FL("sapdfs: no sessions are valid, stopping timer"));
 			sap_stop_dfs_cac_timer(sap_ctx);
 		}
@@ -3409,7 +3409,7 @@ static QDF_STATUS sap_fsm_state_dfs_cac_wait(ptSapContext sap_ctx,
 		sap_ctx->sapsMachine = eSAP_DISCONNECTING;
 		qdf_status = sap_goto_disconnecting(sap_ctx);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
 			  "eSAP_DFS_CAC_WAIT", msg);
 	}
@@ -3442,7 +3442,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx,
 		 * Transition from eSAP_STARTING to eSAP_STARTED
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state channel = %d %s => %s"),
 			  sap_ctx->channel, "eSAP_STARTING", "eSAP_STARTED");
 		sap_ctx->sapsMachine = eSAP_STARTED;
@@ -3486,7 +3486,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx,
 		 * Transition from STARTING to DISCONNECTED
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("from state %s => %s"),
 			  "eSAP_STARTING", "eSAP_DISCONNECTED");
 
@@ -3502,7 +3502,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx,
 		 * Transition from eSAP_STARTING to eSAP_DISCONNECTED
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_STARTING", "eSAP_DISCONNECTED");
 
@@ -3526,7 +3526,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx,
 
 		sap_ctx->sapsMachine = eSAP_STARTED;
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_STARTING", "eSAP_STARTED");
 
@@ -3535,7 +3535,7 @@ static QDF_STATUS sap_fsm_state_starting(ptSapContext sap_ctx,
 				  eSAP_START_BSS_EVENT,
 				  (void *)eSAP_STATUS_SUCCESS);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
 			  "eSAP_STARTING", msg);
 	}
@@ -3564,7 +3564,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx,
 		 * Transition from eSAP_STARTED to eSAP_DISCONNECTING
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_STARTED", "eSAP_DISCONNECTING");
 		sap_ctx->sapsMachine = eSAP_DISCONNECTING;
@@ -3585,8 +3585,8 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx,
 			    mac_ctx->sap.sapCtxList[intf].pSapContext != NULL) {
 				temp_sap_ctx =
 				    mac_ctx->sap.sapCtxList[intf].pSapContext;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_MED,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_MED,
 					  FL("sapdfs: Sending CSAIE for sapctx[%p]"),
 					  temp_sap_ctx);
 
@@ -3595,7 +3595,7 @@ static QDF_STATUS sap_fsm_state_started(ptSapContext sap_ctx,
 			}
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
 			  "eSAP_STARTED", msg);
 	}
@@ -3625,7 +3625,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx,
 		 * Transition from eSAP_DISCONNECTING to eSAP_DISCONNECTED
 		 * (both without substates)
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("from state %s => %s"),
 			  "eSAP_DISCONNECTING", "eSAP_DISCONNECTED");
 		sap_ctx->sapsMachine = eSAP_DISCONNECTED;
@@ -3642,7 +3642,7 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx,
 			}
 		}
 	} else if (msg == eWNI_SME_CHANNEL_CHANGE_REQ) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("sapdfs: Send channel change request on sapctx[%p]"),
 			  sap_ctx);
 		/*
@@ -3652,10 +3652,10 @@ static QDF_STATUS sap_fsm_state_disconnecting(ptSapContext sap_ctx,
 		qdf_status = wlansap_channel_change_request((void *) sap_ctx,
 				mac_ctx->sap.SapDfsInfo.target_channel);
 
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL("Sending DFS eWNI_SME_CHANNEL_CHANGE_REQ"));
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("in state %s, invalid event msg %d"),
 			  "eSAP_DISCONNECTING", msg);
 	}
@@ -3686,19 +3686,19 @@ QDF_STATUS sap_fsm(ptSapContext sap_ctx, ptWLAN_SAPEvent sap_event)
 	tpAniSirGlobal mac_ctx;
 
 	if (NULL == hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid hal"));
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	mac_ctx = PMAC_STRUCT(hal);
 	if (NULL == mac_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid MAC context"));
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 		  FL("sap_ctx=%p, state_var=%d, msg=0x%x"),
 		  sap_ctx, state_var, msg);
 
@@ -3807,7 +3807,7 @@ sapconvert_to_csr_profile(tsap_Config_t *pconfig_params, eCsrRoamBssType bssType
 		profile->pRSNReqIE =
 			cdf_mem_malloc(pconfig_params->RSNWPAReqIELength);
 		if (NULL == profile->pRSNReqIE) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  " %s Fail to alloc memory", __func__);
 			return eSAP_STATUS_FAILURE;
 		}
@@ -3903,7 +3903,7 @@ void sap_sort_mac_list(struct qdf_mac_addr *macList, uint8_t size)
 	int32_t nRes = -1;
 
 	if ((NULL == macList) || (size > MAX_ACL_MAC_ADDRESS)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("either buffer is NULL or size = %d is more"), size);
 		return;
 	}
@@ -3938,7 +3938,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
 	nEnd = num_mac - 1;
 
 	if ((NULL == macList) || (num_mac > MAX_ACL_MAC_ADDRESS)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		    FL("either buffer is NULL or size = %d is more."), num_mac);
 		return eSAP_FALSE;
 	}
@@ -3950,14 +3950,14 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
 					 QDF_MAC_ADDR_SIZE);
 
 		if (0 == nRes) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "search SUCC");
 			/* "index equals NULL" means the caller does not need the */
 			/* index value of the peerMac being searched */
 			if (index != NULL) {
 				*index = (uint8_t) nMiddle;
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_HIGH, "index %d",
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_HIGH, "index %d",
 					  *index);
 			}
 			return eSAP_TRUE;
@@ -3968,7 +3968,7 @@ sap_search_mac_list(struct qdf_mac_addr *macList,
 			nEnd = nMiddle - 1;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "search not succ");
 	return eSAP_FALSE;
 }
@@ -3979,11 +3979,11 @@ void sap_add_mac_to_acl(struct qdf_mac_addr *macList,
 	int32_t nRes = -1;
 	int i;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "add acl entered");
 
 	if (NULL == macList || *size == 0 || *size > MAX_ACL_MAC_ADDRESS) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("either buffer is NULL or size = %d is incorrect."),
 			*size);
 		return;
@@ -4012,7 +4012,7 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList,
 {
 	int i;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "remove acl entered");
 	/*
 	 * Return if the list passed is empty. Ideally this should never happen
@@ -4022,7 +4022,7 @@ void sap_remove_mac_from_acl(struct qdf_mac_addr *macList,
 	 */
 	if ((macList == NULL) || (*size == 0) ||
 					(*size > MAX_ACL_MAC_ADDRESS)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("either buffer is NULL or size %d is incorrect."),
 			*size);
 		return;
@@ -4043,11 +4043,11 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size)
 {
 	int i;
 	uint8_t *macArray;
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "print acl entered");
 
 	if ((NULL == macList) || (size == 0) || (size >= MAX_ACL_MAC_ADDRESS)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, either buffer is NULL or size %d is incorrect.",
 			  __func__, size);
 		return;
@@ -4055,7 +4055,7 @@ void sap_print_acl(struct qdf_mac_addr *macList, uint8_t size)
 
 	for (i = 0; i < size; i++) {
 		macArray = (macList + i)->bytes;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "** ACL entry %i - " MAC_ADDRESS_STR, i,
 			  MAC_ADDR_ARRAY(macArray));
 	}
@@ -4073,7 +4073,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac)
 
 	if (sap_search_mac_list
 		    (sapContext->denyMacList, sapContext->nDenyMac, peerMac, NULL)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR " in deny list",
 			  __func__, MAC_ADDR_ARRAY(peerMac));
 		return QDF_STATUS_E_FAILURE;
@@ -4084,7 +4084,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac)
 
 	/* A new station CANNOT associate, unless in accept list. More stringent mode */
 	if (eSAP_DENY_UNLESS_ACCEPTED == sapContext->eSapMacAddrAclMode) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR
 			  " denied, Mac filter mode is eSAP_DENY_UNLESS_ACCEPTED",
 			  __func__, MAC_ADDR_ARRAY(peerMac));
@@ -4097,7 +4097,7 @@ QDF_STATUS sap_is_peer_mac_allowed(ptSapContext sapContext, uint8_t *peerMac)
 	if (eSAP_SUPPORT_ACCEPT_AND_DENY == sapContext->eSapMacAddrAclMode) {
 		sap_signal_hdd_event(sapContext, NULL, eSAP_UNKNOWN_STA_JOIN,
 				     (void *) peerMac);
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "In %s, Peer " MAC_ADDRESS_STR
 			  " denied, Mac filter mode is eSAP_SUPPORT_ACCEPT_AND_DENY",
 			  __func__, MAC_ADDR_ARRAY(peerMac));
@@ -4134,7 +4134,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal);
 
 	if (NULL == hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid HAL pointer from p_cds_gctx"));
 		*num_ch = 0;
 		*ch_list = NULL;
@@ -4143,7 +4143,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 
 	start_ch_num = sap_ctx->acs_cfg->start_ch;
 	end_ch_num = sap_ctx->acs_cfg->end_ch;
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			FL("startChannel %d, EndChannel %d, HW:%d"),
 			start_ch_num, end_ch_num,
 			sap_ctx->acs_cfg->hw_mode);
@@ -4151,11 +4151,11 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 	wlansap_extend_to_acs_range(&start_ch_num, &end_ch_num,
 					    &band_start_ch, &band_end_ch);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL("expanded startChannel %d,EndChannel %d"),
 			  start_ch_num, end_ch_num);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  FL("band_start_ch %d, band_end_ch %d"),
 			  band_start_ch, band_end_ch);
 
@@ -4172,7 +4172,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 	list = (uint8_t *) cdf_mem_malloc(NUM_5GHZ_CHANNELS +
 						NUM_24GHZ_CHANNELS);
 	if (NULL == list) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL("Unable to allocate channel list"));
 		*num_ch = 0;
 		*ch_list = NULL;
@@ -4218,13 +4218,13 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 			list[ch_count] =
 				CDS_CHANNEL_NUM(loop_count);
 			ch_count++;
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO,
 				FL("%d %d added to ACS ch range"),
 				ch_count, ch);
 		    } else {
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("%d %d skipped from ACS ch range"),
 				ch_count, ch);
 		    }
@@ -4232,8 +4232,8 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 			list[ch_count] =
 				CDS_CHANNEL_NUM(loop_count);
 			ch_count++;
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				QDF_TRACE_LEVEL_INFO,
 				FL("%d %d added to ACS ch range"),
 				ch_count, ch);
 		}
@@ -4249,14 +4249,14 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 #endif
 	}
 	if (0 == ch_count) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		    FL("No active channels present for the current region"));
 		/*
 		 * LTE COEX: channel range outside the restricted 2.4GHz
 		 * band limits
 		 */
 		if (en_lte_coex && (start_ch_num > band_end_ch))
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 				FL("SAP can't be started as due to LTE COEX"));
 	}
 
@@ -4270,7 +4270,7 @@ static QDF_STATUS sap_get_channel_list(ptSapContext sap_ctx,
 	}
 
 	for (loop_count = 0; loop_count < ch_count; loop_count++) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_DEBUG,
 			FL("channel number: %d"), list[loop_count]);
 	}
 	return QDF_STATUS_SUCCESS;
@@ -4286,7 +4286,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext)
 	uint8_t count = 0;
 	int i;
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid sapContext pointer on sap_get_channel_list");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -4300,7 +4300,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext)
 		(tChannelInfo *) cdf_mem_malloc(WNI_CFG_VALID_CHANNEL_LIST_LEN *
 						sizeof(tChannelInfo));
 	if (NULL == sapContext->SapAllChnlList.channelList) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  " Memory Allocation failed sap_get_channel_list");
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -4310,7 +4310,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext)
 		    CDS_CHANNEL_STATE(i) == CHANNEL_STATE_DFS) {
 			sapContext->SapAllChnlList.channelList[count].channel =
 				CDS_CHANNEL_NUM(i);
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 				  "%s[%d] CHANNEL = %d", __func__, __LINE__,
 				  sapContext->SapAllChnlList.channelList[count].
 				  channel);
@@ -4321,7 +4321,7 @@ static QDF_STATUS sap_get5_g_hz_channel_list(ptSapContext sapContext)
 	}
 
 	sapContext->SapAllChnlList.numChannel = count;
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%s[%d] NUMBER OF CHANNELS count = %d"
 		  "sapContext->SapAllChnlList.numChannel = %d",
 		  __func__, __LINE__, count,
@@ -4350,7 +4350,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext,
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s invalid hHal", __func__);
 		return 0;
 	}
@@ -4378,7 +4378,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext,
 	sap_get5_g_hz_channel_list(sapContext);
 
 	if (dfs_event->chan_list.nchannels > SIR_DFS_MAX_20M_SUB_CH) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 			  FL("nchannels >SIR_DFS_MAX_20M_SUB_CH so resetting"));
 		dfs_event->chan_list.nchannels = SIR_DFS_MAX_20M_SUB_CH;
 	}
@@ -4402,7 +4402,7 @@ uint8_t sap_indicate_radar(ptSapContext sapContext,
 				     eSAP_DFS_NO_AVAILABLE_CHANNEL,
 				     (void *) eSAP_STATUS_SUCCESS);
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_WARN,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_WARN,
 		  FL("sapdfs: New selected target channel is [%d]"),
 		  target_channel);
 	return target_channel;
@@ -4420,7 +4420,7 @@ void sap_dfs_cac_timer_callback(void *data)
 	tpAniSirGlobal pMac;
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s invalid hHal", __func__);
 		return;
 	}
@@ -4428,7 +4428,7 @@ void sap_dfs_cac_timer_callback(void *data)
 	sapContext = sap_find_valid_concurrent_session(hHal);
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s no SAP contexts are found", __func__);
 		return;
 	}
@@ -4441,7 +4441,7 @@ void sap_dfs_cac_timer_callback(void *data)
 		/*
 		 * CAC Complete, post eSAP_DFS_CHANNEL_CAC_END to sap_fsm
 		 */
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 			  "sapdfs: Sending eSAP_DFS_CHANNEL_CAC_END for target_channel = %d on sapctx[%p]",
 			  sapContext->channel, sapContext);
 
@@ -4467,7 +4467,7 @@ static int sap_stop_dfs_cac_timer(ptSapContext sapContext)
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s invalid hHal", __func__);
 		return 0;
 	}
@@ -4523,7 +4523,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext)
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s invalid hHal", __func__);
 		return 0;
 	}
@@ -4545,7 +4545,7 @@ int sap_start_dfs_cac_timer(ptSapContext sapContext)
 		(sap_is_channel_bonding_etsi_weather_channel(sapContext)))) {
 		cacTimeOut = ETSI_WEATHER_CH_CAC_TIMEOUT;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_MED,
 		  "sapdfs: SAP_DFS_CHANNEL_CAC_START on CH - %d, CAC TIMEOUT - %d sec",
 		  sapContext->channel, cacTimeOut / 1000);
 
@@ -4579,14 +4579,14 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext)
 	tpAniSirGlobal pMac;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid sapContext pointer on sap_init_dfs_channel_nol_list");
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "In %s invalid hHal", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -4608,8 +4608,8 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext)
 				.dfs_channel_number =
 					CDS_CHANNEL_NUM(i);
 
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  "%s: CHANNEL = %d", __func__,
 					  pMac->sap.SapDfsInfo.
 					  sapDfsChannelNolList[count].
@@ -4627,7 +4627,7 @@ QDF_STATUS sap_init_dfs_channel_nol_list(ptSapContext sapContext)
 
 	pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels = count;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 		  "%s[%d] NUMBER OF DFS CHANNELS = %d",
 		  __func__, __LINE__,
 		  pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels);
@@ -4676,14 +4676,14 @@ bool is_concurrent_sap_ready_for_channel_change(tHalHandle hHal,
 				(ptSapContext) pMac->sap.sapCtxList[intf].
 				pSapContext;
 			if (pSapContext == sapContext) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sapCtx matched [%p]"),
 					  sapContext);
 				continue;
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL
 						  ("concurrent sapCtx[%p] didn't matche with [%p]"),
 					  pSapContext, sapContext);
diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c
index a84d010820ed..e14f19edcf75 100644
--- a/core/sap/src/sap_module.c
+++ b/core/sap/src/sap_module.c
@@ -42,7 +42,7 @@
 /*----------------------------------------------------------------------------
  * Include Files
  * -------------------------------------------------------------------------*/
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "qdf_util.h"
 /* Pick up the sme callback registration API */
 #include "sme_api.h"
@@ -109,13 +109,13 @@ void *wlansap_open(void *p_cds_gctx)
 	pSapCtx = (ptSapContext) cdf_mem_malloc(sizeof(tSapContext));
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 		return NULL;
 	}
 
 	/* Clean up SAP control block, initialize all values */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open");
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH, "wlansap_open");
 
 	wlansap_clean_cb(pSapCtx, 0); /*do not empty */
 
@@ -149,7 +149,7 @@ QDF_STATUS wlansap_start(void *pCtx)
 
 	/*- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_start invoked successfully");
 	/*------------------------------------------------------------------------
 	    Sanity check
@@ -158,7 +158,7 @@ QDF_STATUS wlansap_start(void *pCtx)
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -186,7 +186,7 @@ QDF_STATUS wlansap_start(void *pCtx)
 	pSapCtx->csr_roamProfile.negotiatedAuthType = eCSR_AUTH_TYPE_OPEN_SYSTEM;        /* open is the default */
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_create(&pSapCtx->SapGlobalLock))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "wlansap_start failed init lock");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -214,12 +214,12 @@ QDF_STATUS wlansap_stop(void *pCtx)
 	ptSapContext pSapCtx = NULL;
 
 	/* Sanity check - Extract SAP control block */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_stop invoked successfully ");
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -227,7 +227,7 @@ QDF_STATUS wlansap_stop(void *pCtx)
 	sap_free_roam_profile(&pSapCtx->csr_roamProfile);
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(&pSapCtx->SapGlobalLock))) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "wlansap_stop failed destroy lock");
 		return QDF_STATUS_E_FAULT;
 	}
@@ -254,18 +254,18 @@ QDF_STATUS wlansap_close(void *pCtx)
 	ptSapContext pSapCtx = NULL;
 
 	/* Sanity check - Extract SAP control block */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_close invoked");
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	/* Cleanup SAP control block */
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_close");
 
 	/* empty queues/lists/pkts if any */
@@ -300,7 +300,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag      /* 0 /
 	   ------------------------------------------------------------------------*/
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -308,7 +308,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag      /* 0 /
 	/*------------------------------------------------------------------------
 	    Clean up SAP control block, initialize all values
 	   ------------------------------------------------------------------------*/
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_clean_cb");
 
 	cdf_mem_zero(pSapCtx, sizeof(tSapContext));
@@ -317,7 +317,7 @@ QDF_STATUS wlansap_clean_cb(ptSapContext pSapCtx, uint32_t freeFlag      /* 0 /
 
 	pSapCtx->sapsMachine = eSAP_DISCONNECTED;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Initializing State: %d, sapContext value = %p", __func__,
 		  pSapCtx->sapsMachine, pSapCtx);
 	pSapCtx->sessionId = 0;
@@ -352,7 +352,7 @@ wlansap_pmc_full_pwr_req_cb(void *callbackContext, QDF_STATUS status)
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		/* If success what else to be handled??? */
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			  "wlansap_pmc_full_pwr_req_cb: PMC failed to put the chip in Full power");
 
 	}
@@ -376,7 +376,7 @@ uint8_t wlansap_get_state(void *pCtx)
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -407,7 +407,7 @@ uint16_t wlansap_check_cc_intf(void *Ctx)
 
 	hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid MAC context from p_cds_gctx", __func__);
 		return 0;
 	}
@@ -438,13 +438,13 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig,
 	tHalHandle h_hal = NULL;
 
 	if (NULL == pconfig) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid pconfig passed ", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (NULL == psap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid pconfig passed ", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -475,7 +475,7 @@ wlansap_set_scan_acs_channel_params(tsap_Config_t *pconfig,
 
 	h_hal = (tHalHandle)CDS_GET_HAL_CB(psap_ctx->p_cds_gctx);
 	if (NULL == h_hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			"%s: Invalid MAC context from pvosGCtx", __func__);
 	} else {
 		/*
@@ -507,7 +507,7 @@ uint32_t wlan_sap_get_vht_ch_width(void *ctx)
 	ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx);
 
 	if (!sap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid SAP pointer from ctx"));
 		return 0;
 	}
@@ -529,7 +529,7 @@ void wlan_sap_set_vht_ch_width(void *ctx, uint32_t vht_channel_width)
 	ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx);
 
 	if (!sap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid SAP pointer from ctx"));
 		return;
 	}
@@ -601,11 +601,11 @@ QDF_STATUS wlansap_start_bss(void *pCtx,     /* pwextCtx */
 	   ------------------------------------------------------------------------*/
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_start_bss: sapContext=%p", pSapCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -645,7 +645,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx,     /* pwextCtx */
 			       &pSapCtx->csr_roamProfile);
 	hHal = (tHalHandle) CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Invalid MAC context from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -664,7 +664,7 @@ QDF_STATUS wlansap_start_bss(void *pCtx,     /* pwextCtx */
 
 	pmac = PMAC_STRUCT(hHal);
 	if (NULL == pmac) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Invalid MAC context from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -719,12 +719,12 @@ QDF_STATUS wlansap_set_mac_acl(void *pCtx,    /* pwextCtx */
 	QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
 	ptSapContext pSapCtx = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "wlansap_set_mac_acl");
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -776,7 +776,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx)
 	    Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid Global CDS handle", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -784,7 +784,7 @@ QDF_STATUS wlansap_stop_bss(void *pCtx)
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -827,7 +827,7 @@ wlansap_get_assoc_stations
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -867,7 +867,7 @@ wlansap_remove_wps_session_overlap(void *pCtx,
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -902,7 +902,7 @@ QDF_STATUS wlansap_get_wps_session_overlap(void *pCtx)
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -921,7 +921,7 @@ QDF_STATUS wlansap_set_mode(void *pCtx, uint32_t mode)
 	ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -936,7 +936,7 @@ QDF_STATUS wlansap_get_acl_mode(void *pCtx, eSapMacAddrACL *mode)
 	ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx);
 
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -952,7 +952,7 @@ wlansap_get_acl_accept_list(void *pCtx, struct qdf_mac_addr *pAcceptList,
 {
 	ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -970,7 +970,7 @@ wlansap_get_acl_deny_list(void *pCtx, struct qdf_mac_addr *pDenyList,
 {
 	ptSapContext pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1038,19 +1038,19 @@ wlansap_modify_acl
 	ptSapContext sap_ctx = CDS_GET_SAP_CB(ctx);
 
 	if (NULL == sap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP Context", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 		  "Modify ACL entered\n" "Before modification of ACL\n"
 		  "size of accept and deny lists %d %d", sap_ctx->nAcceptMac,
 		  sap_ctx->nDenyMac);
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "*** WHITE LIST ***");
 	sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac);
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "*** BLACK LIST ***");
 	sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac);
 
@@ -1064,7 +1064,7 @@ wlansap_modify_acl
 				 peer_sta_mac, &staBLIndex);
 
 	if (sta_white_list && sta_black_list) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Peer mac " MAC_ADDRESS_STR
 			  " found in white and black lists."
 			  "Initial lists passed incorrect. Cannot execute this command.",
@@ -1072,7 +1072,7 @@ wlansap_modify_acl
 		return QDF_STATUS_E_FAILURE;
 
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 		  "cmd %d", cmd);
 
 	switch (list_type) {
@@ -1081,8 +1081,8 @@ wlansap_modify_acl
 			/* error check */
 			/* if list is already at max, return failure */
 			if (sap_ctx->nAcceptMac == MAX_ACL_MAC_ADDRESS) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "White list is already maxed out. Cannot accept "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
@@ -1090,8 +1090,8 @@ wlansap_modify_acl
 			}
 			if (sta_white_list) {
 				/* Do nothing if already present in white list. Just print a warning */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address already present in white list "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
@@ -1099,22 +1099,22 @@ wlansap_modify_acl
 			}
 			if (sta_black_list) {
 				/* remove it from black list before adding to the white list */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "STA present in black list so first remove from it");
 				sap_remove_mac_from_acl(sap_ctx->
 						    denyMacList,
 						    &sap_ctx->nDenyMac,
 						    staBLIndex);
 			}
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO,
 				  "... Now add to the white list");
 			sap_add_mac_to_acl(sap_ctx->acceptMacList,
 					       &sap_ctx->nAcceptMac,
 			       peer_sta_mac);
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO_LOW,
 				  "size of accept and deny lists %d %d",
 				  sap_ctx->nAcceptMac,
 				  sap_ctx->nDenyMac);
@@ -1123,8 +1123,8 @@ wlansap_modify_acl
 
 				struct tagCsrDelStaParams delStaParams;
 
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO,
 					  "Delete from white list");
 				sap_remove_mac_from_acl(sap_ctx->acceptMacList,
 						    &sap_ctx->nAcceptMac,
@@ -1135,21 +1135,21 @@ wlansap_modify_acl
 					(SIR_MAC_MGMT_DEAUTH >> 4),
 					&delStaParams);
 				wlansap_deauth_sta(ctx, &delStaParams);
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  "size of accept and deny lists %d %d",
 					  sap_ctx->nAcceptMac,
 					  sap_ctx->nDenyMac);
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address to be deleted is not present in the white list "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "Invalid cmd type passed");
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -1162,8 +1162,8 @@ wlansap_modify_acl
 			/* error check */
 			/* if list is already at max, return failure */
 			if (sap_ctx->nDenyMac == MAX_ACL_MAC_ADDRESS) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "Black list is already maxed out. Cannot accept "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
@@ -1171,8 +1171,8 @@ wlansap_modify_acl
 			}
 			if (sta_black_list) {
 				/* Do nothing if already present in white list */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address already present in black list "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
@@ -1180,8 +1180,8 @@ wlansap_modify_acl
 			}
 			if (sta_white_list) {
 				/* remove it from white list before adding to the black list */
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "Present in white list so first remove from it");
 				sap_remove_mac_from_acl(sap_ctx->
 						    acceptMacList,
@@ -1195,39 +1195,39 @@ wlansap_modify_acl
 				(SIR_MAC_MGMT_DEAUTH >> 4),
 				&delStaParams);
 			wlansap_deauth_sta(ctx, &delStaParams);
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO,
 				  "... Now add to black list");
 			sap_add_mac_to_acl(sap_ctx->denyMacList,
 				       &sap_ctx->nDenyMac, peer_sta_mac);
-			CDF_TRACE(QDF_MODULE_ID_SAP,
-				  CDF_TRACE_LEVEL_INFO_LOW,
+			QDF_TRACE(QDF_MODULE_ID_SAP,
+				  QDF_TRACE_LEVEL_INFO_LOW,
 				  "size of accept and deny lists %d %d",
 				  sap_ctx->nAcceptMac,
 				  sap_ctx->nDenyMac);
 		} else if (cmd == DELETE_STA_FROM_ACL) {
 			if (sta_black_list) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO,
 					  "Delete from black list");
 				sap_remove_mac_from_acl(sap_ctx->denyMacList,
 						    &sap_ctx->nDenyMac,
 						    staBLIndex);
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_INFO_LOW,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_INFO_LOW,
 					  "no accept and deny mac %d %d",
 					  sap_ctx->nAcceptMac,
 					  sap_ctx->nDenyMac);
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					  QDF_TRACE_LEVEL_WARN,
 					  "MAC address to be deleted is not present in the black list "
 					  MAC_ADDRESS_STR,
 					  MAC_ADDR_ARRAY(peer_sta_mac));
 				return QDF_STATUS_E_FAILURE;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "Invalid cmd type passed");
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -1235,17 +1235,17 @@ wlansap_modify_acl
 
 	default:
 	{
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "Invalid list type passed %d", list_type);
 		return QDF_STATUS_E_FAILURE;
 	}
 	}
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
 		  "After modification of ACL");
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "*** WHITE LIST ***");
 	sap_print_acl(sap_ctx->acceptMacList, sap_ctx->nAcceptMac);
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "*** BLACK LIST ***");
 	sap_print_acl(sap_ctx->denyMacList, sap_ctx->nDenyMac);
 	return QDF_STATUS_SUCCESS;
@@ -1272,7 +1272,7 @@ QDF_STATUS wlansap_disassoc_sta(void *pCtx, const uint8_t *pPeerStaMac)
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1308,7 +1308,7 @@ QDF_STATUS wlansap_deauth_sta(void *pCtx,
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return qdf_status;
 	}
@@ -1370,7 +1370,7 @@ static QDF_STATUS wlansap_update_csa_channel_params(ptSapContext sap_context,
 
 	hal = CDS_GET_HAL_CB(sap_context->p_cds_gctx);
 	if (!hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid hal pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1449,7 +1449,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 
 	sapContext = CDS_GET_SAP_CB(p_cds_gctx);
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 
 		return QDF_STATUS_E_FAULT;
@@ -1457,7 +1457,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1480,7 +1480,7 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 		valid = wlan_sap_validate_channel_switch(hHal, targetChannel,
 				sapContext);
 		if (!valid) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 					FL("Channel switch to %u is not allowed due to concurrent channel interference"),
 					targetChannel);
 			return QDF_STATUS_E_FAULT;
@@ -1520,8 +1520,8 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 			 * user input is used for the bandwidth
 			 */
 			if (target_bw != CH_WIDTH_MAX) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_INFO,
 					"%s: target bw:%d new width:%d",
 					__func__, target_bw,
 					pMac->sap.SapDfsInfo.
@@ -1571,21 +1571,21 @@ wlansap_set_channel_change_with_csa(void *p_cds_gctx, uint32_t targetChannel,
 			sap_fsm(sapContext, &sapEvent);
 
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Failed to request Channel Change, since"
 				  "SAP is not in eSAP_STARTED state", __func__);
 			return QDF_STATUS_E_FAULT;
 		}
 
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Channel = %d is not valid in the current"
 			  "regulatory domain", __func__, targetChannel);
 
 		return QDF_STATUS_E_FAULT;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: Posted eSAP_DFS_CHNL_SWITCH_ANNOUNCEMENT_START"
 		  "successfully to sap_fsm for Channel = %d",
 		  __func__, targetChannel);
@@ -1624,7 +1624,7 @@ QDF_STATUS wlansap_set_counter_measure(void *pCtx, bool bEnable)
 	   Extract SAP control block
 	   ------------------------------------------------------------------------*/
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1657,14 +1657,14 @@ QDF_STATUS wlansap_set_key_sta(void *pCtx, tCsrRoamSetKey *pSetKeyInfo)
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1702,7 +1702,7 @@ wlan_sap_getstation_ie_information
 
 	sap_ctx = CDS_GET_SAP_CB(ctx);
 	if (NULL == sap_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid SAP pointer from pCtx"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -1710,13 +1710,13 @@ wlan_sap_getstation_ie_information
 	if (len) {
 		ie_len = *len;
 		*len = sap_ctx->nStaWPARSnReqIeLength;
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			FL("WPAIE len : %x"), *len);
 		if ((buf) && (ie_len >= sap_ctx->nStaWPARSnReqIeLength)) {
 			cdf_mem_copy(buf,
 				sap_ctx->pStaWpaRsnReqIE,
 				sap_ctx->nStaWPARSnReqIeLength);
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 				FL("WPAIE: %02x:%02x:%02x:%02x:%02x:%02x"),
 				buf[0], buf[1], buf[2], buf[3], buf[4],
 				buf[5]);
@@ -1743,12 +1743,12 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe)
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s, %d", __func__, __LINE__);
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1756,7 +1756,7 @@ QDF_STATUS wlansap_set_wps_ie(void *pCtx, tSap_WPSIE *pSap_WPSIe)
 
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1803,12 +1803,12 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx)
 	QDF_STATUS cdf_ret_status = QDF_STATUS_E_FAILURE;
 	void *hHal = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "%s, %d", __func__, __LINE__);
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1816,7 +1816,7 @@ QDF_STATUS wlansap_update_wps_ie(void *pCtx)
 
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1852,12 +1852,12 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState)
 	ptSapContext pSapCtx = NULL;
 	void *hHal = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  "%s, %d", __func__, __LINE__);
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1865,7 +1865,7 @@ QDF_STATUS wlansap_get_wps_state(void *pCtx, bool *bWPSState)
 
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1931,7 +1931,7 @@ QDF_STATUS wlansap_set_wparsn_ies
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1939,7 +1939,7 @@ QDF_STATUS wlansap_set_wparsn_ies
 
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -1983,14 +1983,14 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf,
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
 			  __func__, hHal, pSapCtx->isSapSessionOpen);
 		return QDF_STATUS_E_FAULT;
@@ -2004,7 +2004,7 @@ QDF_STATUS wlansap_send_action(void *pCtx, const uint8_t *pBuf,
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "Failed to Send Action Frame");
 
 	return QDF_STATUS_E_FAULT;
@@ -2037,14 +2037,14 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx,
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
 			  __func__, hHal, pSapCtx->isSapSessionOpen);
 		return QDF_STATUS_E_FAULT;
@@ -2058,7 +2058,7 @@ QDF_STATUS wlansap_remain_on_channel(void *pCtx,
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "Failed to Set Remain on Channel");
 
 	return QDF_STATUS_E_FAULT;
@@ -2084,7 +2084,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
@@ -2092,7 +2092,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if ((NULL == hHal) ||
 		(eSAP_TRUE != pSapCtx->isSapSessionOpen)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
 			  __func__, hHal, pSapCtx->isSapSessionOpen);
 		return QDF_STATUS_E_FAULT;
@@ -2106,7 +2106,7 @@ QDF_STATUS wlansap_cancel_remain_on_channel(void *pCtx,
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "Failed to Cancel Remain on Channel");
 
 	return QDF_STATUS_E_FAULT;
@@ -2135,14 +2135,14 @@ QDF_STATUS wlansap_register_mgmt_frame
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
 			  __func__, hHal, pSapCtx->isSapSessionOpen);
 		return QDF_STATUS_E_FAULT;
@@ -2156,7 +2156,7 @@ QDF_STATUS wlansap_register_mgmt_frame
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "Failed to Register MGMT frame");
 
 	return QDF_STATUS_E_FAULT;
@@ -2185,14 +2185,14 @@ QDF_STATUS wlansap_de_register_mgmt_frame
 
 	pSapCtx = CDS_GET_SAP_CB(pCtx);
 	if (NULL == pSapCtx) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from pCtx",
 			  __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(pSapCtx->p_cds_gctx);
 	if ((NULL == hHal) || (eSAP_TRUE != pSapCtx->isSapSessionOpen)) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HAL pointer (%p) NULL OR SME session is not open (%d)",
 			  __func__, hHal, pSapCtx->isSapSessionOpen);
 		return QDF_STATUS_E_FAULT;
@@ -2206,7 +2206,7 @@ QDF_STATUS wlansap_de_register_mgmt_frame
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 		  "Failed to Deregister MGMT frame");
 
 	return QDF_STATUS_E_FAULT;
@@ -2251,14 +2251,14 @@ wlansap_channel_change_request(void *pSapCtx, uint8_t target_channel)
 	sapContext = (ptSapContext) pSapCtx;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2328,14 +2328,14 @@ QDF_STATUS wlansap_start_beacon_req(void *pSapCtx)
 	sapContext = (ptSapContext) pSapCtx;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2385,14 +2385,14 @@ QDF_STATUS wlansap_dfs_send_csa_ie_request(void *pSapCtx)
 	sapContext = (ptSapContext) pSapCtx;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2439,7 +2439,7 @@ QDF_STATUS wlansap_get_dfs_ignore_cac(tHalHandle hHal, uint8_t *pIgnore_cac)
 	if (NULL != hHal) {
 		pMac = PMAC_STRUCT(hHal);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid hHal pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2476,7 +2476,7 @@ QDF_STATUS wlansap_set_dfs_ignore_cac(tHalHandle hHal, uint8_t ignore_cac)
 	if (NULL != hHal) {
 		pMac = PMAC_STRUCT(hHal);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid hHal pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2506,7 +2506,7 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
 	if (NULL != hHal) {
 		pMac = PMAC_STRUCT(hHal);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid hHal pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2519,14 +2519,14 @@ wlansap_set_dfs_restrict_japan_w53(tHalHandle hHal, uint8_t disable_Dfs_W53)
 	 */
 	if (DFS_MKK4_DOMAIN == dfs_region) {
 		pMac->sap.SapDfsInfo.is_dfs_w53_disabled = disable_Dfs_W53;
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_INFO_LOW,
 			  FL("sapdfs: SET DFS JAPAN W53 DISABLED = %d"),
 			  pMac->sap.SapDfsInfo.is_dfs_w53_disabled);
 
 		status = QDF_STATUS_SUCCESS;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Regdomain not japan, set disable JP W53 not valid"));
 
@@ -2553,8 +2553,8 @@ wlan_sap_set_channel_avoidance(tHalHandle hal, bool sap_channel_avoidance)
 	if (NULL != hal)
 		mac_ctx = PMAC_STRUCT(hal);
 	if (mac_ctx == NULL || hal == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_ERROR,
 			  FL("hal or mac_ctx pointer NULL"));
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2590,7 +2590,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
 	if (NULL != hHal) {
 		pMac = PMAC_STRUCT(hHal);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid hHal pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2605,8 +2605,8 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
 	if (DFS_MKK4_DOMAIN == dfs_region) {
 		pMac->sap.SapDfsInfo.sap_operating_chan_preferred_location =
 			dfs_Preferred_Channels_location;
-		CDF_TRACE(QDF_MODULE_ID_SAP,
-			  CDF_TRACE_LEVEL_INFO_LOW,
+		QDF_TRACE(QDF_MODULE_ID_SAP,
+			  QDF_TRACE_LEVEL_INFO_LOW,
 			  FL
 				  ("sapdfs:Set Preferred Operating Channel location=%d"),
 			  pMac->sap.SapDfsInfo.
@@ -2614,7 +2614,7 @@ wlansap_set_dfs_preferred_channel_location(tHalHandle hHal,
 
 		status = QDF_STATUS_SUCCESS;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("sapdfs:NOT JAPAN REG, Invalid Set preferred chans location"));
 
@@ -2653,7 +2653,7 @@ QDF_STATUS wlansap_set_dfs_target_chnl(tHalHandle hHal, uint8_t target_channel)
 	if (NULL != hHal) {
 		pMac = PMAC_STRUCT(hHal);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid hHal pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2688,8 +2688,8 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
 			bufferLength = additionIELength;
 			pBuffer = cdf_mem_malloc(bufferLength);
 			if (NULL == pBuffer) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("Could not allocate the buffer "));
 				return QDF_STATUS_E_NOMEM;
 			}
@@ -2707,7 +2707,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
 			cdf_mem_free(pConfig->pProbeRespBcnIEsBuffer);
 			pConfig->probeRespBcnIEsLen = 0;
 			pConfig->pProbeRespBcnIEsBuffer = NULL;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL
 					  ("No Probe Resp beacone IE received in set beacon"));
 		}
@@ -2720,7 +2720,7 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
 			cdf_mem_free(pConfig->pProbeRespIEsBuffer);
 			pConfig->probeRespIEsBufferLen = 0;
 			pConfig->pProbeRespIEsBuffer = NULL;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL
 					  ("No Probe Response IE received in set beacon"));
 		}
@@ -2733,13 +2733,13 @@ wlansap_update_sap_config_add_ie(tsap_Config_t *pConfig,
 			cdf_mem_free(pConfig->pAssocRespIEsBuffer);
 			pConfig->assocRespIEsLen = 0;
 			pConfig->pAssocRespIEsBuffer = NULL;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL
 					  ("No Assoc Response IE received in set beacon"));
 		}
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("No matching buffer type %d"), updateType);
 		if (pBuffer != NULL)
 			cdf_mem_free(pBuffer);
@@ -2753,7 +2753,7 @@ QDF_STATUS
 wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateType)
 {
 	if (NULL == pConfig) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid Config pointer", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2783,7 +2783,7 @@ wlansap_reset_sap_config_add_ie(tsap_Config_t *pConfig, eUpdateIEsType updateTyp
 
 	default:
 		if (eUPDATE_IE_ALL != updateType)
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  FL("Invalid buffer type %d"), updateType);
 		break;
 	}
@@ -2893,20 +2893,20 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx)
 	bool bAvailable = false;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	pMac = PMAC_STRUCT(hHal);
 
 	if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s: DFS NOL is empty", __func__);
 		return QDF_STATUS_SUCCESS;
 	}
@@ -2914,7 +2914,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx)
 	dfs_nol = pMac->sap.SapDfsInfo.sapDfsChannelNolList;
 
 	if (!dfs_nol) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s: DFS NOL context is null", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
@@ -2944,7 +2944,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx)
 				eSAP_DFS_CHANNEL_AVAILABLE;
 			dfs_nol[i].radar_found_timestamp = 0;
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Channel[%d] is AVAILABLE",
 				  __func__, dfs_nol[i].dfs_channel_number);
 		} else {
@@ -2953,7 +2953,7 @@ QDF_STATUS wlansap_get_dfs_nol(void *pSapCtx)
 			left_time = SAP_DFS_NON_OCCUPANCY_PERIOD - elapsed_time;
 			left_time = left_time / (60 * 1000 * 1000);
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Channel[%d] is UNAVAILABLE [%lu min left]",
 				  __func__,
 				  dfs_nol[i].dfs_channel_number, left_time);
@@ -2991,26 +2991,26 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf)
 	tpAniSirGlobal pMac = NULL;
 
 	if (NULL == sapContext) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid SAP pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	hHal = CDS_GET_HAL_CB(sapContext->p_cds_gctx);
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid HAL pointer from p_cds_gctx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 	pMac = PMAC_STRUCT(hHal);
 
 	if (!pMac->sap.SapDfsInfo.numCurrentRegDomainDfsChannels) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 			  "%s: DFS NOL is empty", __func__);
 		return QDF_STATUS_SUCCESS;
 	}
 
 	if (conf == eSAP_DFS_NOL_CLEAR) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: clear the DFS NOL", __func__);
 
 		for (i = 0;
@@ -3027,7 +3027,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf)
 			sapDfsChannelNolList[i].radar_found_timestamp = 0;
 		}
 	} else if (conf == eSAP_DFS_NOL_RANDOMIZE) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Randomize the DFS NOL", __func__);
 
 		/* random 1/0 to decide to put the channel into NOL */
@@ -3063,7 +3063,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf)
 				[i].radar_found_timestamp = 0;
 			}
 
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Set channel[%d] %s",
 				  __func__,
 				  pMac->sap.SapDfsInfo.sapDfsChannelNolList[i]
@@ -3074,7 +3074,7 @@ QDF_STATUS wlansap_set_dfs_nol(void *pSapCtx, eSapDfsNolType conf)
 				  "AVAILABLE");
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			  "%s: unsupport type %d", __func__, conf);
 	}
 
@@ -3119,7 +3119,7 @@ void wlansap_populate_del_sta_params(const uint8_t *mac,
 	else
 		pDelStaParams->subtype = (SIR_MAC_MGMT_DEAUTH >> 4);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO,
 		  FL(
 		     "Delete STA with RC:%hu subtype:%hhu MAC::"
 		     MAC_ADDRESS_STR),
@@ -3155,7 +3155,7 @@ wlansap_acs_chselect(void *pvos_gctx,
 
 	sap_context = CDS_GET_SAP_CB(pvos_gctx);
 	if (NULL == sap_context) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid SAP pointer from pvos_gctx", __func__);
 
 		return QDF_STATUS_E_FAULT;
@@ -3163,13 +3163,13 @@ wlansap_acs_chselect(void *pvos_gctx,
 
 	h_hal = (tHalHandle)CDS_GET_HAL_CB(sap_context->p_cds_gctx);
 	if (NULL == h_hal) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid MAC context from pvosGCtx", __func__);
 		return QDF_STATUS_E_FAULT;
 	}
 
 	if (sap_context->isSapSessionOpen == eSAP_TRUE) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_FATAL,
 			"%s:SME Session is already opened\n", __func__);
 		return QDF_STATUS_E_EXISTS;
 	}
@@ -3201,8 +3201,8 @@ wlansap_acs_chselect(void *pvos_gctx,
 						sap_context->self_mac_addr,
 						&sap_context->sessionId,
 						type, subType)) {
-				CDF_TRACE(QDF_MODULE_ID_SAP,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SAP,
+					QDF_TRACE_LEVEL_ERROR,
 					"Error: In %s calling sme_OpenSession",
 					__func__);
 				return QDF_STATUS_E_FAILURE;
@@ -3237,7 +3237,7 @@ wlansap_acs_chselect(void *pvos_gctx,
 		qdf_status = sap_goto_channel_sel(sap_context, NULL, true);
 
 		if (QDF_STATUS_E_ABORTED == qdf_status) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"In %s,DFS not supported in the current operating mode",
 			__func__);
 			return QDF_STATUS_E_FAILURE;
@@ -3247,9 +3247,9 @@ wlansap_acs_chselect(void *pvos_gctx,
 			* failed or ACS is overridden due to other constrainst
 			* So send selected channel to HDD
 			*/
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				FL("Scan Req Failed/ACS Overridden"));
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 				FL("Selected channel = %d"),
 				sap_context->channel);
 			if (sap_context->isScanSessionOpen == eSAP_TRUE) {
@@ -3265,8 +3265,8 @@ wlansap_acs_chselect(void *pvos_gctx,
 					sap_context->isScanSessionOpen =
 								eSAP_FALSE;
 				else
-					CDF_TRACE(QDF_MODULE_ID_SAP,
-						CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SAP,
+						QDF_TRACE_LEVEL_ERROR,
 						"ACS Scan Session close fail");
 				sap_context->sessionId = 0xff;
 			}
@@ -3275,7 +3275,7 @@ wlansap_acs_chselect(void *pvos_gctx,
 					eSAP_ACS_CHANNEL_SELECTED,
 					(void *) eSAP_STATUS_SUCCESS);
 		} else if (QDF_STATUS_SUCCESS == qdf_status) {
-			CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Successfully Issued a Pre Start Bss Scan Request"));
 		}
 	}
@@ -3316,7 +3316,7 @@ wlansap_get_phymode(void *pctx)
 
 	sap_context = CDS_GET_SAP_CB(pctx);
 	if (NULL == sap_context) {
-		CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid SAP pointer from pctx", __func__);
 		return eCSR_DOT11_MODE_AUTO;
 	}
diff --git a/core/sme/inc/sme_inside.h b/core/sme/inc/sme_inside.h
index f954514f73ae..04b9be37358e 100644
--- a/core/sme/inc/sme_inside.h
+++ b/core/sme/inc/sme_inside.h
@@ -39,7 +39,7 @@
   ------------------------------------------------------------------------*/
 #include "qdf_status.h"
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "sir_api.h"
diff --git a/core/sme/inc/sme_internal.h b/core/sme/inc/sme_internal.h
index 1872ad4ce832..61f7d82b1061 100644
--- a/core/sme/inc/sme_internal.h
+++ b/core/sme/inc/sme_internal.h
@@ -39,7 +39,7 @@
   ------------------------------------------------------------------------*/
 #include "qdf_status.h"
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "host_diag_core_event.h"
diff --git a/core/sme/inc/sme_power_save.h b/core/sme/inc/sme_power_save.h
index b4fbdb221f60..6c3c1450a903 100644
--- a/core/sme/inc/sme_power_save.h
+++ b/core/sme/inc/sme_power_save.h
@@ -28,7 +28,7 @@
 #if !defined(__SME_POWER_SAVE_H)
 #define __SME_POWER_SAVE_H
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "ani_system_defs.h"
diff --git a/core/sme/inc/sme_qos_api.h b/core/sme/inc/sme_qos_api.h
index 473ef1774c94..59515080bb95 100644
--- a/core/sme/inc/sme_qos_api.h
+++ b/core/sme/inc/sme_qos_api.h
@@ -38,7 +38,7 @@
   Include Files
   ------------------------------------------------------------------------*/
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "ani_global.h"
diff --git a/core/sme/inc/sme_qos_internal.h b/core/sme/inc/sme_qos_internal.h
index 7dd26da6a4a9..61570d4c8abd 100644
--- a/core/sme/inc/sme_qos_internal.h
+++ b/core/sme/inc/sme_qos_internal.h
@@ -38,7 +38,7 @@
   Include Files
   ------------------------------------------------------------------------*/
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "ani_global.h"
diff --git a/core/sme/inc/sme_rrm_api.h b/core/sme/inc/sme_rrm_api.h
index 8c159f0e563b..9e8d56f16382 100644
--- a/core/sme/inc/sme_rrm_api.h
+++ b/core/sme/inc/sme_rrm_api.h
@@ -38,7 +38,7 @@
   Include Files
   ------------------------------------------------------------------------*/
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "ani_global.h"
diff --git a/core/sme/inc/sme_rrm_internal.h b/core/sme/inc/sme_rrm_internal.h
index 77ea6355de19..9814e48a5794 100644
--- a/core/sme/inc/sme_rrm_internal.h
+++ b/core/sme/inc/sme_rrm_internal.h
@@ -38,7 +38,7 @@
   Include Files
   ------------------------------------------------------------------------*/
 #include "qdf_lock.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cdf_memory.h"
 #include "qdf_types.h"
 #include "rrm_global.h"
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 58968fc14adf..6b35228b4efa 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -44,10 +44,10 @@
 #include "csr_internal.h"
 #include "wma_types.h"
 #include "wma_if.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "sme_trace.h"
 #include "qdf_types.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "cds_utils.h"
 #include "sap_api.h"
 #include "mac_trace.h"
@@ -378,7 +378,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac)
 					  active_list_cmd_timeout_handle, (void *)pMac);
 
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "Init Timer fail for active list command process time out");
 			cdf_mem_free(pMac->sme.smeCmdActiveList.
 				     cmdTimeoutTimer);
@@ -610,7 +610,7 @@ tSmeCmd *sme_get_command_buffer(tpAniSirGlobal pMac)
 		csr_ll_unlock(&pMac->roam.roamCmdPendingList);
 
 		/* panic with out-of-command */
-		CDF_BUG(0);
+		QDF_BUG(0);
 	}
 
 	/* memset to zero */
@@ -629,7 +629,7 @@ void sme_push_command(tpAniSirGlobal pMac, tSmeCmd *pCmd, bool fHighPriority)
 {
 	if (!SME_IS_START(pMac)) {
 		sms_log(pMac, LOGE, FL("Sme in stop state"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -903,7 +903,7 @@ sme_process_cmd:
 	csr_ll_insert_head(&pMac->sme.smeCmdActiveList, &pCommand->Link,
 			   LL_ACCESS_NOLOCK);
 	/* .... and process the command. */
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_COMMAND,
 			 pCommand->sessionId, pCommand->command));
 
 	switch (pCommand->command) {
@@ -974,7 +974,7 @@ sme_process_cmd:
 	case eSmeCommandTdlsAddPeer:
 	case eSmeCommandTdlsDelPeer:
 	case eSmeCommandTdlsLinkEstablish:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("sending TDLS Command 0x%x to PE"),
 			  pCommand->command);
 		csr_ll_unlock(&pMac->sme.smeCmdActiveList);
@@ -1141,7 +1141,7 @@ QDF_STATUS sme_set11dinfo(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SET_11DINFO, NO_SESSION, 0));
 	if (NULL == pSmeConfigParams) {
 		sms_log(pMac, LOGE,
@@ -1193,7 +1193,7 @@ QDF_STATUS sme_get_soft_ap_domain(tHalHandle hHal, v_REGDOMAIN_t *domainIdSoftAp
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_GET_SOFTAP_DOMAIN,
 			 NO_SESSION, 0));
 	if (NULL == domainIdSoftAp) {
@@ -1212,7 +1212,7 @@ QDF_STATUS sme_set_reg_info(tHalHandle hHal, uint8_t *apCntryCode)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SET_REGINFO, NO_SESSION, 0));
 	if (NULL == apCntryCode) {
 		sms_log(pMac, LOGE, "Empty Country Code, nothing to update");
@@ -1250,7 +1250,7 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq)
 	}
 
 	if (!pSession->sessionActive) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid Sessionid"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
@@ -1267,15 +1267,15 @@ QDF_STATUS sme_set_plm_request(tHalHandle hHal, tpSirPlmReq pPlmReq)
 				/* DFS channel is provided, no PLM bursts can be
 				 * transmitted. Ignoring these channels.
 				 */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO,
 					  FL("DFS channel %d ignored for PLM"),
 					  pPlmReq->plmChList[count]);
 				continue;
 			}
 		} else if (!ret) {
 			/* Not supported, ignore the channel */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("Unsupported channel %d ignored for PLM"),
 				  pPlmReq->plmChList[count]);
 			continue;
@@ -1303,7 +1303,7 @@ send_plm_start:
 
 	if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA,
 						       &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post WMA_SET_PLM_REQ to WMA"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
@@ -1340,7 +1340,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_UPDATE_CONFIG, NO_SESSION,
 			 0));
 	if (NULL == pSmeConfigParams) {
@@ -1381,7 +1381,7 @@ QDF_STATUS sme_update_config(tHalHandle hHal, tpSmeConfigParams pSmeConfigParams
 	status = sme_cfg_set_int(hHal, WNI_CFG_SCAN_IN_POWERSAVE, true);
 
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Could not pass on WNI_CFG_SCAN_IN_POWERSAVE to CFG");
 	}
 	return status;
@@ -1479,12 +1479,12 @@ void sme_process_get_gtk_info_rsp(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: pMac is null", __func__);
 		return;
 	}
 	if (pMac->sme.gtk_offload_get_info_cb == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: HDD callback is null", __func__);
 		return;
 	}
@@ -1516,7 +1516,7 @@ void sme_process_ready_to_suspend(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: pMac is null", __func__);
 		return;
 	}
@@ -1547,7 +1547,7 @@ void sme_process_ready_to_ext_wow(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: pMac is null", __func__);
 		return;
 	}
@@ -1631,7 +1631,7 @@ QDF_STATUS sme_hdd_ready_ind(tHalHandle hHal)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_HDDREADYIND, NO_SESSION, 0));
 	do {
 
@@ -1844,7 +1844,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu
 
 		roamStatus = eCSR_ROAM_DFS_RADAR_IND;
 		roamResult = eCSR_ROAM_RESULT_DFS_RADAR_FOUND_IND;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "sapdfs: Radar indication event occurred");
 		break;
 	}
@@ -1861,7 +1861,7 @@ QDF_STATUS dfs_msg_processor(tpAniSirGlobal pMac, uint16_t msgType, void *pMsgBu
 		sessionId = csaIeTxCompleteRsp->sessionId;
 		roamStatus = eCSR_ROAM_DFS_CHAN_SW_NOTIFY;
 		roamResult = eCSR_ROAM_RESULT_DFS_CHANSW_UPDATE_SUCCESS;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "sapdfs: Received eWNI_SME_DFS_CSAIE_TX_COMPLETE_IND for session id [%d]",
 			  sessionId);
 		break;
@@ -2178,7 +2178,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
 	switch (pMsg->type) {
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	case eWNI_SME_HO_FAIL_IND:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("LFR3: Rcvd eWNI_SME_HO_FAIL_IND"));
 		csr_process_ho_fail_ind(pMac, pMsg->bodyptr);
 		cdf_mem_free(pMsg->bodyptr);
@@ -2431,7 +2431,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
 	/* channel avoid message arrived, send IND to client */
 	case eWNI_SME_CH_AVOID_IND:
 		if (pMac->sme.pChAvoidNotificationCb) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("CH avoid notification"));
 			pMac->sme.pChAvoidNotificationCb(pMac->hHdd,
 							 pMsg->bodyptr);
@@ -2442,7 +2442,7 @@ QDF_STATUS sme_process_msg(tHalHandle hHal, cds_msg_t *pMsg)
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
 	case eWNI_SME_AUTO_SHUTDOWN_IND:
 		if (pMac->sme.pAutoShutdownNotificationCb) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("Auto shutdown notification"));
 			pMac->sme.pAutoShutdownNotificationCb();
 		}
@@ -2936,7 +2936,7 @@ QDF_STATUS sme_scan_request(tHalHandle hal, uint8_t session_id,
 	cds_msg_t msg;
 	uint32_t scan_req_id, scan_count;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 		 TRACE_CODE_SME_RX_HDD_MSG_SCAN_REQ, session_id,
 		 scan_req->scanType));
 	if (!mac_ctx->scan.fScanEnable) {
@@ -3011,7 +3011,7 @@ QDF_STATUS sme_scan_get_result(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_GET_RESULTS, sessionId,
 			 0));
 	sms_log(pMac, LOG2, FL("enter"));
@@ -3050,13 +3050,13 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle,
 	tSirBssDescription first_ap_profile;
 
 	if (NULL == mac_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("mac_ctx is NULL"));
 		return QDF_STATUS_E_FAILURE;
 	}
 	scan_filter = cdf_mem_malloc(sizeof(tCsrScanResultFilter));
 	if (NULL == scan_filter) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("scan_filter mem alloc failed"));
 		return QDF_STATUS_E_FAILURE;
 	} else {
@@ -3086,7 +3086,7 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle,
 				scan_filter->bOSENAssociation = 0;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Preparing the profile filter failed"));
 			cdf_mem_free(scan_filter);
 			return QDF_STATUS_E_FAILURE;
@@ -3102,8 +3102,8 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle,
 			*scan_cache = filtered_scan_result;
 			if (0 != first_ap_profile.channelId) {
 				*ap_chnl_id = first_ap_profile.channelId;
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("Found best AP & its on chnl[%d]"),
 					  first_ap_profile.channelId);
 			} else {
@@ -3113,20 +3113,20 @@ QDF_STATUS sme_get_ap_channel_from_scan_cache(tHalHandle hal_handle,
 				 * take of zero channel id case.
 				 */
 				*ap_chnl_id = 0;
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("Scan is empty, set chnl to 0"));
 				status = QDF_STATUS_E_FAILURE;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 					FL("Failed to get scan get result"));
 			status = QDF_STATUS_E_FAILURE;
 		}
 		csr_free_scan_filter(mac_ctx, scan_filter);
 		sme_release_global_lock(&mac_ctx->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Aquiring lock failed"));
 		status = QDF_STATUS_E_FAILURE;
 	}
@@ -3160,7 +3160,7 @@ bool sme_store_joinreq_param(tHalHandle hal_handle,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	bool ret_status = true;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			TRACE_CODE_SME_RX_HDD_STORE_JOIN_REQ,
 			session_id, 0));
 	status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -3195,7 +3195,7 @@ bool sme_clear_joinreq_param(tHalHandle hal_handle,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	bool ret_status = true;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 				TRACE_CODE_SME_RX_HDD_CLEAR_JOIN_REQ,
 				session_id, 0));
 	status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -3232,7 +3232,7 @@ QDF_STATUS sme_issue_stored_joinreq(tHalHandle hal_handle,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	QDF_STATUS ret_status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 				TRACE_CODE_SME_RX_HDD_ISSUE_JOIN_REQ,
 				session_id, 0));
 	status = sme_acquire_global_lock(&mac_ctx->sme);
@@ -3261,7 +3261,7 @@ QDF_STATUS sme_scan_flush_result(tHalHandle hHal)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS,
 			 0, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3286,7 +3286,7 @@ QDF_STATUS sme_filter_scan_results(tHalHandle hHal, uint8_t sessionId)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_RESULTS,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3303,7 +3303,7 @@ QDF_STATUS sme_scan_flush_p2p_result(tHalHandle hHal, uint8_t sessionId)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_FLUSH_P2PRESULTS,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3330,7 +3330,7 @@ tCsrScanResultInfo *sme_scan_result_get_first(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrScanResultInfo *pRet = NULL;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETFIRST,
 			 NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3358,7 +3358,7 @@ tCsrScanResultInfo *sme_scan_result_get_next(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrScanResultInfo *pRet = NULL;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_GETNEXT,
 			 NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3385,7 +3385,7 @@ QDF_STATUS sme_scan_result_purge(tHalHandle hHal, tScanResultHandle hScanResult)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_SCAN_RESULT_PURGE,
 			 NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3491,7 +3491,7 @@ QDF_STATUS sme_roam_connect(tHalHandle hHal, uint8_t sessionId,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_CONNECT, sessionId, 0));
 	sms_log(pMac, LOG2, FL("enter"));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3531,7 +3531,7 @@ QDF_STATUS sme_set_phy_mode(tHalHandle hHal, eCsrPhyMode phyMode)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -3566,7 +3566,7 @@ QDF_STATUS sme_roam_reassoc(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_REASSOC, sessionId, 0));
 	sms_log(pMac, LOG2, FL("enter"));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3603,7 +3603,7 @@ QDF_STATUS sme_roam_connect_to_last_profile(tHalHandle hHal, uint8_t sessionId)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3633,7 +3633,7 @@ QDF_STATUS sme_roam_disconnect(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_DISCONNECT, sessionId,
 			 reason));
 	sms_log(pMac, LOG2, FL("enter"));
@@ -3691,7 +3691,7 @@ QDF_STATUS sme_roam_disconnect_sta(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
@@ -3729,11 +3729,11 @@ QDF_STATUS sme_roam_deauth_sta(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_MSG_DEAUTH_STA,
 			 sessionId, pDelStaParams->reason_code));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3765,7 +3765,7 @@ QDF_STATUS sme_roam_tkip_counter_measures(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
@@ -3808,7 +3808,7 @@ QDF_STATUS sme_roam_get_associated_stas(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
@@ -3848,7 +3848,7 @@ QDF_STATUS sme_roam_get_wps_session_overlap(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
@@ -3912,7 +3912,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_GET_CONNECTPROFILE,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3939,7 +3939,7 @@ QDF_STATUS sme_roam_get_connect_profile(tHalHandle hHal, uint8_t sessionId,
  */
 void sme_roam_free_connect_profile(tCsrRoamConnectedProfile *profile)
 {
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_FREE_CONNECTPROFILE,
 			 NO_SESSION, 0));
 	csr_roam_free_connect_profile(profile);
@@ -3970,7 +3970,7 @@ QDF_STATUS sme_roam_set_pmkid_cache(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_SET_PMKIDCACHE, sessionId,
 			 numItems));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -3994,7 +3994,7 @@ QDF_STATUS sme_roam_del_pmkid_from_cache(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_DEL_PMKIDCACHE,
 			 sessionId, flush_cache));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -4158,7 +4158,7 @@ QDF_STATUS sme_roam_get_pmkid_cache(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ROAM_GET_PMKIDCACHE, sessionId,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -4189,7 +4189,7 @@ QDF_STATUS sme_get_config_param(tHalHandle hHal, tSmeConfigParams *pParam)
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_CONFIGPARAM, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -4319,7 +4319,7 @@ QDF_STATUS sme_get_modify_profile_fields(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_MODPROFFIELDS, sessionId,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -4347,7 +4347,7 @@ void sme_set_dhcp_till_power_active_flag(tHalHandle hal, uint8_t flag)
 	tpAniSirGlobal mac = PMAC_STRUCT(hal);
 	struct ps_global_info *ps_global_info = &mac->sme.ps_global_info;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 				TRACE_CODE_SME_RX_HDD_SET_DHCP_FLAG, NO_SESSION,
 				flag));
 	/* Set/Clear the DHCP flag which will disable/enable auto PS */
@@ -4494,7 +4494,7 @@ QDF_STATUS sme_wow_add_pattern(tHalHandle hal,
 	struct wow_add_pattern *ptrn;
 	tSirRetStatus ret_code = eSIR_SUCCESS;
 	tSirMsgQ msg_q;
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			TRACE_CODE_SME_RX_HDD_WOWL_ADDBCAST_PATTERN, session_id,
 			0));
 	ptrn = cdf_mem_malloc(sizeof(*ptrn));
@@ -4535,7 +4535,7 @@ QDF_STATUS sme_wow_delete_pattern(tHalHandle hal,
 	struct wow_delete_pattern *delete_ptrn;
 	tSirRetStatus ret_code = eSIR_SUCCESS;
 	tSirMsgQ msg_q;
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_WOWL_DELBCAST_PATTERN, sessionId,
 			 0));
 	delete_ptrn = cdf_mem_malloc(sizeof(*delete_ptrn));
@@ -4612,7 +4612,7 @@ QDF_STATUS sme_enter_wowl(tHalHandle hal_ctx,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			TRACE_CODE_SME_RX_HDD_ENTER_WOWL, session_id, 0));
 
 	/* cache the WOWL information */
@@ -4651,7 +4651,7 @@ QDF_STATUS sme_exit_wowl(tHalHandle hal_ctx,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	uint8_t session_id;
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			TRACE_CODE_SME_RX_HDD_EXIT_WOWL, NO_SESSION, 0));
 	session_id = wowl_exit_params->sessionId;
 	status = sme_ps_process_command(mac_ctx, session_id, SME_PS_WOWL_EXIT);
@@ -4681,7 +4681,7 @@ QDF_STATUS sme_roam_set_key(tHalHandle hal,  uint8_t session_id,
 	tCsrRoamSession *session = NULL;
 	struct ps_global_info *ps_global_info = &mac_ctx->sme.ps_global_info;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_SET_KEY,
 			 session_id, 0));
 	if (set_key->keyLength > CSR_MAX_KEY_LEN) {
 		sms_log(mac_ctx, LOGE, FL("Invalid key length %d"),
@@ -4755,7 +4755,7 @@ QDF_STATUS sme_get_rssi(tHalHandle hHal,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_RSSI, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -4849,7 +4849,7 @@ QDF_STATUS sme_get_statistics(tHalHandle hHal,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_STATS, NO_SESSION,
 			 periodicity));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -4878,7 +4878,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal,
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		pMsg = cdf_mem_malloc(sizeof(tAniGetLinkStatus));
 		if (NULL == pMsg) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to allocate memory for link status",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -4897,7 +4897,7 @@ QDF_STATUS sme_get_link_status(tHalHandle hHal,
 
 		if (!QDF_IS_STATUS_SUCCESS
 			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post LINK STATUS MSG fail", __func__);
 			cdf_mem_free(pMsg);
 			pMac->sme.linkStatusContext = NULL;
@@ -4938,7 +4938,7 @@ QDF_STATUS sme_get_country_code(tHalHandle hHal, uint8_t *pBuf, uint8_t *pbLen)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_CNTRYCODE, NO_SESSION, 0));
 
 	return csr_get_country_code(pMac, pBuf, pbLen);
@@ -5012,7 +5012,7 @@ QDF_STATUS sme_change_country_code(tHalHandle hHal,
 	cds_msg_t msg;
 	tAniChangeCountryCodeReq *pMsg;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CHANGE_CNTRYCODE, NO_SESSION,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -5093,7 +5093,7 @@ QDF_STATUS sme_generic_change_country_code(tHalHandle hHal,
 	tAniGenericChangeCountryCodeReq *pMsg;
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: pMac is null", __func__);
 		return status;
 	}
@@ -5176,7 +5176,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal,
 
 		pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd));
 		if (NULL == pMsg) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to allocate memory for dhcp start",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -5196,7 +5196,7 @@ QDF_STATUS sme_dhcp_start_ind(tHalHandle hHal,
 
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post DHCP Start MSG fail", __func__);
 			cdf_mem_free(pMsg);
 			status = QDF_STATUS_E_FAILURE;
@@ -5246,7 +5246,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
 
 		pMsg = (tAniDHCPInd *) cdf_mem_malloc(sizeof(tAniDHCPInd));
 		if (NULL == pMsg) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to allocate memory for dhcp stop",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -5267,7 +5267,7 @@ QDF_STATUS sme_dhcp_stop_ind(tHalHandle hHal,
 
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post DHCP Stop MSG fail", __func__);
 			cdf_mem_free(pMsg);
 			status = QDF_STATUS_E_FAILURE;
@@ -5291,7 +5291,7 @@ void sme_set_cfg_privacy(tHalHandle hHal,
 			 tCsrRoamProfile *pProfile, bool fPrivacy)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_CFGPRIVACY, NO_SESSION, 0));
 	if (QDF_STATUS_SUCCESS == sme_acquire_global_lock(&pMac->sme)) {
 		csr_set_cfg_privacy(pMac, pProfile, fPrivacy);
@@ -5317,7 +5317,7 @@ QDF_STATUS sme_neighbor_report_request(tHalHandle hHal, uint8_t sessionId,
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_NEIGHBOR_REPORTREQ, NO_SESSION,
 			 0));
 
@@ -5585,7 +5585,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback,
 	QDF_STATUS status;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	CDF_TRACE(QDF_MODULE_ID_SAP, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: type=%d, subType=%d", __func__, type, subType);
 
 	if (NULL == pbSessionId) {
@@ -5602,7 +5602,7 @@ QDF_STATUS sme_open_session(tHalHandle hHal, csr_roam_completeCallback callback,
 		}
 	}
 	if (NULL != pbSessionId)
-		MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+		MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 				 TRACE_CODE_SME_RX_HDD_OPEN_SESSION,
 				 *pbSessionId, 0));
 
@@ -5633,7 +5633,7 @@ QDF_STATUS sme_close_session(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CLOSE_SESSION, sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5753,7 +5753,7 @@ QDF_STATUS sme_set_host_offload(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_HOSTOFFLOAD, sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -5791,19 +5791,19 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "%s: KeyReplayCounter: %lld", __func__,
 		  pGtkOffload->ullKeyReplayCounter);
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Session not found ", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	request_buf = cdf_mem_malloc(sizeof(*request_buf));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  FL("Not able to allocate memory for GTK offload request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -5818,7 +5818,7 @@ QDF_STATUS sme_set_gtk_offload(tHalHandle hHal,
 	msg.bodyptr = request_buf;
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post SIR_HAL_SET_GTK_OFFLOAD message to HAL"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -5845,18 +5845,18 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: Entered",
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: Entered",
 		  __func__);
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Session not found", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	request_buf = cdf_mem_malloc(sizeof(*request_buf));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			 FL("Not able to allocate memory for Get GTK offload request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -5885,7 +5885,7 @@ QDF_STATUS sme_get_gtk_offload(tHalHandle hHal,
 
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post WMA_GTK_OFFLOAD_GETINFO_REQ message to WMA"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -5910,17 +5910,17 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_LOW,
 			FL("WMA_SET_KEEP_ALIVE message"));
 
 	if (pSession == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Session not Found"));
 		return QDF_STATUS_E_FAILURE;
 	}
 	request_buf = cdf_mem_malloc(sizeof(tSirKeepAliveReq));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to allocate memory for keep alive request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -5928,7 +5928,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id,
 	qdf_copy_macaddr(&request->bssid, &pSession->connectedProfile.bssid);
 	cdf_mem_copy(request_buf, request, sizeof(tSirKeepAliveReq));
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_LOW,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_LOW,
 			"buff TP %d input TP %d ", request_buf->timePeriod,
 		  request->timePeriod);
 	request_buf->sessionId = session_id;
@@ -5938,7 +5938,7 @@ QDF_STATUS sme_set_keep_alive(tHalHandle hHal, uint8_t session_id,
 	msg.bodyptr = request_buf;
 	if (QDF_STATUS_SUCCESS !=
 			cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Not able to post WMA_SET_KEEP_ALIVE message to WMA"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -5966,7 +5966,7 @@ QDF_STATUS sme_set_preferred_network_list(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_PREF_NET_LIST,
 			 sessionId, request->ucNetworksCount));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -5997,7 +5997,7 @@ QDF_STATUS sme_abort_mac_scan(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_ABORT_MACSCAN, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -6101,7 +6101,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_REGISTER_MGMTFR, sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -6117,7 +6117,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 		}
 
 		if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s Invalid Sessionid", __func__);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_FAILURE;
@@ -6162,7 +6162,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_DEREGISTER_MGMTFR, sessionId,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -6179,7 +6179,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 		}
 
 		if (!CSR_IS_SESSION_ANY(sessionId) && !pSession->sessionActive) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s Invalid Sessionid", __func__);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_FAILURE;
@@ -6233,7 +6233,7 @@ QDF_STATUS sme_remain_on_channel(tHalHandle hHal, uint8_t session_id,
 	cds_msg_t msg;
 
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_REMAIN_ONCHAN, session_id, 0));
 
 	scan_count = csr_ll_count(&mac_ctx->sme.smeScanCmdActiveList);
@@ -6322,7 +6322,7 @@ QDF_STATUS sme_update_p2p_ie(tHalHandle hHal, void *p2pIe, uint32_t p2pIeLength)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_UPDATE_P2P_IE, NO_SESSION, 0));
 	/* acquire the lock for the sme object */
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -6373,7 +6373,7 @@ QDF_STATUS sme_send_action(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SEND_ACTION, sessionId, 0));
 	/* acquire the lock for the sme object */
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -6395,7 +6395,7 @@ QDF_STATUS sme_cancel_remain_on_channel(tHalHandle hHal,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CANCEL_REMAIN_ONCHAN, sessionId,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -6451,7 +6451,7 @@ QDF_STATUS sme_configure_rxp_filter(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	cds_msg_t cds_message;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_RXPFIL, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -6498,7 +6498,7 @@ QDF_STATUS sme_configure_suspend_ind(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	cds_msg_t cds_message;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_SUSPENDIND, NO_SESSION,
 			 0));
 
@@ -6547,7 +6547,7 @@ QDF_STATUS sme_configure_resume_req(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	cds_msg_t cds_message;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_RESUMEREQ, NO_SESSION,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -6589,7 +6589,7 @@ QDF_STATUS sme_configure_ext_wow(tHalHandle hHal,
 	if (!MsgPtr)
 		return QDF_STATUS_E_NOMEM;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_EXTWOW, NO_SESSION, 0));
 
 	pMac->readyToExtWoWCallback = callback;
@@ -6647,7 +6647,7 @@ QDF_STATUS sme_configure_app_type1_params(tHalHandle hHal,
 	if (!MsgPtr)
 		return QDF_STATUS_E_NOMEM;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE1, NO_SESSION,
 			 0));
 
@@ -6698,7 +6698,7 @@ QDF_STATUS sme_configure_app_type2_params(tHalHandle hHal,
 	if (!MsgPtr)
 		return QDF_STATUS_E_NOMEM;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_CONFIG_APP_TYPE2, NO_SESSION,
 			 0));
 
@@ -6791,7 +6791,7 @@ uint8_t sme_get_concurrent_operation_channel(tHalHandle hHal)
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 
 		channel = csr_get_concurrent_operation_channel(pMac);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH, "%s: "
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH, "%s: "
 			  " Other Concurrent Channel = %d", __func__, channel);
 		sme_release_global_lock(&pMac->sme);
 	}
@@ -7268,7 +7268,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrRoamSession *pSession = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: "
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: "
 		  "ulMulticastAddrCnt=%d, multicastAddr[0]=%p", __func__,
 		  pMulticastAddrs->ulMulticastAddrCnt,
 		  pMulticastAddrs->multicastAddr[0].bytes);
@@ -7282,7 +7282,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 	}
 
 	if (pSession == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  "%s: Unable to find the session Id: %d", __func__,
 			  sessionId);
 		return QDF_STATUS_E_FAILURE;
@@ -7290,7 +7290,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 
 	request_buf = cdf_mem_malloc(sizeof(tSirRcvFltMcAddrList));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to "
 			  "allocate memory for 8023 Multicast List request",
 			  __func__);
@@ -7298,7 +7298,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 	}
 
 	if (!csr_is_conn_state_connected_infra(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Ignoring the "
 			  "indication as we are not connected", __func__);
 		cdf_mem_free(request_buf);
@@ -7316,7 +7316,7 @@ QDF_STATUS sme_8023_multicast_list(tHalHandle hHal, uint8_t sessionId,
 	msg.reserved = 0;
 	msg.bodyptr = request_buf;
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to "
 			  "post WMA_8023_MULTICAST_LIST message to WMA",
 			  __func__);
@@ -7338,7 +7338,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 	uint8_t idx = 0;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterType=%d, "
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: filterType=%d, "
 		  "filterId = %d", __func__,
 		  pRcvPktFilterCfg->filterType, pRcvPktFilterCfg->filterId);
 
@@ -7347,7 +7347,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 	request_buf = cdf_mem_malloc(allocSize);
 
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to "
 			  "allocate memory for Receive Filter Set Filter request",
 			  __func__);
@@ -7355,7 +7355,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 	}
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Session Not found ", __func__);
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -7371,27 +7371,27 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 	msg.reserved = 0;
 	msg.bodyptr = request_buf;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : "
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Pkt Flt Req : "
 		  "FT %d FID %d ",
 		  request_buf->filterType, request_buf->filterId);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "Pkt Flt Req : "
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "Pkt Flt Req : "
 		  "params %d CT %d",
 		  request_buf->numFieldParams, request_buf->coalesceTime);
 
 	for (idx = 0; idx < request_buf->numFieldParams; idx++) {
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "Proto %d Comp Flag %d ",
 			  request_buf->paramsData[idx].protocolLayer,
 			  request_buf->paramsData[idx].cmpFlag);
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "Data Offset %d Data Len %d",
 			  request_buf->paramsData[idx].dataOffset,
 			  request_buf->paramsData[idx].dataLength);
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "CData: %d:%d:%d:%d:%d:%d",
 			  request_buf->paramsData[idx].compareData[0],
 			  request_buf->paramsData[idx].compareData[1],
@@ -7400,7 +7400,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 			  request_buf->paramsData[idx].compareData[4],
 			  request_buf->paramsData[idx].compareData[5]);
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "MData: %d:%d:%d:%d:%d:%d",
 			  request_buf->paramsData[idx].dataMask[0],
 			  request_buf->paramsData[idx].dataMask[1],
@@ -7412,7 +7412,7 @@ QDF_STATUS sme_receive_filter_set_filter(tHalHandle hHal,
 	}
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post "
 			  "WMA_RECEIVE_FILTER_SET_FILTER message to WMA",
 			  __func__);
@@ -7432,18 +7432,18 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s: filterId = %d",
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s: filterId = %d",
 		  __func__, pRcvFltPktClearParam->filterId);
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Session Not found", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	request_buf = cdf_mem_malloc(sizeof(tSirRcvFltPktClearParam));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for Receive Filter "
 			  "Clear Filter request", __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -7461,7 +7461,7 @@ QDF_STATUS sme_receive_filter_clear_filter(tHalHandle hHal,
 	msg.reserved = 0;
 	msg.bodyptr = request_buf;
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post "
 			  "WMA_RECEIVE_FILTER_CLEAR_FILTER message to WMA",
 			  __func__);
@@ -7563,7 +7563,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB)
 	pMaxTxPowerPerBandParams =
 		cdf_mem_malloc(sizeof(tMaxTxPowerPerBandParams));
 	if (NULL == pMaxTxPowerPerBandParams) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s:Not able to allocate memory for pMaxTxPowerPerBandParams",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -7577,7 +7577,7 @@ QDF_STATUS sme_set_max_tx_power_per_band(eCsrBand band, int8_t dB)
 	msg.bodyptr = pMaxTxPowerPerBandParams;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s:Not able to post WMA_SET_MAX_TX_POWER_PER_BAND_REQ",
 			  __func__);
 		cdf_mem_free(pMaxTxPowerPerBandParams);
@@ -7607,11 +7607,11 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid,
 	cds_msg_t msg;
 	tpMaxTxPowerParams pMaxTxParams = NULL;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_MAXTXPOW, NO_SESSION, 0));
 	pMaxTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams));
 	if (NULL == pMaxTxParams) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for pMaxTxParams",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -7626,7 +7626,7 @@ QDF_STATUS sme_set_max_tx_power(tHalHandle hHal, struct qdf_mac_addr pBssid,
 	msg.bodyptr = pMaxTxParams;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_SET_MAX_TX_POWER_REQ message to WMA",
 			  __func__);
 		cdf_mem_free(pMaxTxParams);
@@ -7653,7 +7653,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr)
 
 	pBaseMacAddr = cdf_mem_malloc(sizeof(tSirMacAddr));
 	if (NULL == pBaseMacAddr) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to allocate memory for pBaseMacAddr"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -7665,7 +7665,7 @@ QDF_STATUS sme_set_custom_mac_addr(tSirMacAddr customMacAddr)
 	msg.bodyptr = pBaseMacAddr;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Not able to post SIR_HAL_SET_BASE_MACADDR_IND message to WMA"));
 		cdf_mem_free(pBaseMacAddr);
@@ -7693,19 +7693,19 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 	tpMaxTxPowerParams pTxParams = NULL;
 	int8_t power = (int8_t) dBm;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_TXPOW, sessionId, 0));
 
 	/* make sure there is no overflow */
 	if ((int)power != dBm) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: error, invalid power = %d", __func__, dBm);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	pTxParams = cdf_mem_malloc(sizeof(tMaxTxPowerParams));
 	if (NULL == pTxParams) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for pTxParams",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -7719,7 +7719,7 @@ QDF_STATUS sme_set_tx_power(tHalHandle hHal, uint8_t sessionId,
 	msg.bodyptr = pTxParams;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: failed to post WMA_SET_TX_POWER_REQ to WMA",
 			  __func__);
 		cdf_mem_free(pTxParams);
@@ -7761,7 +7761,7 @@ QDF_STATUS sme_hide_ssid(tHalHandle hHal, uint8_t sessionId, uint8_t ssidHidden)
 		}
 
 		if (!pSession->sessionActive)
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 
 		/* Create the message and send to lim */
 		len = sizeof(tSirUpdateParams);
@@ -7799,7 +7799,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod
 	cds_msg_t cds_message;
 	tAniSetTmLevelReq *setTmLevelReq = NULL;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_TMLEVEL, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
@@ -7807,7 +7807,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod
 			(tAniSetTmLevelReq *)
 			cdf_mem_malloc(sizeof(tAniSetTmLevelReq));
 		if (NULL == setTmLevelReq) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to allocate memory for sme_set_tm_level",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -7822,7 +7822,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod
 		cds_message.type = WMA_SET_TM_LEVEL_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Set TM Level MSG fail", __func__);
 			cdf_mem_free(setTmLevelReq);
 			status = QDF_STATUS_E_FAILURE;
@@ -7844,7 +7844,7 @@ QDF_STATUS sme_set_tm_level(tHalHandle hHal, uint16_t newTMLevel, uint16_t tmMod
    ---------------------------------------------------------------------------*/
 void sme_feature_caps_exchange(tHalHandle hHal)
 {
-	MTRACE(cdf_trace
+	MTRACE(qdf_trace
 		       (QDF_MODULE_ID_SME, TRACE_CODE_SME_RX_HDD_CAPS_EXCH, NO_SESSION,
 		       0));
 }
@@ -7872,7 +7872,7 @@ void sme_disable_feature_capablity(uint8_t feature_index)
 void sme_reset_power_values_for5_g(tHalHandle hHal)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_RESET_PW5G, NO_SESSION, 0));
 	csr_save_channel_power_for_band(pMac, true);
 	csr_apply_power2_current(pMac);    /* Store the channel+power info in the global place: Cfg */
@@ -7893,11 +7893,11 @@ QDF_STATUS sme_update_roam_prefer5_g_hz(tHalHandle hHal, bool nRoamPrefer5GHz)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_UPDATE_RP5G, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: gRoamPrefer5GHz is changed from %d to %d",
 			  __func__, pMac->roam.configParam.nRoamPrefer5GHz,
 			  nRoamPrefer5GHz);
@@ -7922,11 +7922,11 @@ QDF_STATUS sme_set_roam_intra_band(tHalHandle hHal, const bool nRoamIntraBand)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_ROAMIBAND, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: gRoamIntraBand is changed from %d to %d",
 			  __func__, pMac->roam.configParam.nRoamIntraBand,
 			  nRoamIntraBand);
@@ -7953,12 +7953,12 @@ QDF_STATUS sme_update_roam_scan_n_probes(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_N_PROBES,
 			 NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: gRoamScanNProbes is changed from %d to %d",
 			  __func__, pMac->roam.configParam.nProbes, nProbes);
 		pMac->roam.configParam.nProbes = nProbes;
@@ -7992,12 +7992,12 @@ QDF_STATUS sme_update_roam_scan_home_away_time(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_UPDATE_ROAM_SCAN_HOME_AWAY_TIME,
 			 NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: gRoamScanHomeAwayTime is changed from %d to %d",
 			  __func__,
 			  pMac->roam.configParam.nRoamScanHomeAwayTime,
@@ -8062,7 +8062,7 @@ QDF_STATUS sme_ext_change_channel(tHalHandle h_hal, uint32_t channel,
 bool sme_get_roam_intra_band(tHalHandle hHal)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_GET_ROAMIBAND, NO_SESSION, 0));
 	return pMac->roam.configParam.nRoamIntraBand;
 }
@@ -8112,7 +8112,7 @@ QDF_STATUS sme_update_roam_rssi_diff(tHalHandle hHal, uint8_t sessionId,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set roam rssi diff to %d - old value is %d - roam state is %s",
 			  RoamRssiDiff,
 			  pMac->roam.configParam.RoamRssiDiff,
@@ -8149,12 +8149,12 @@ QDF_STATUS sme_update_fast_transition_enabled(tHalHandle hHal,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_UPDATE_FTENABLED, NO_SESSION,
 			 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: FastTransitionEnabled is changed from %d to %d",
 			  __func__,
 			  pMac->roam.configParam.isFastTransitionEnabled,
@@ -8187,7 +8187,7 @@ QDF_STATUS sme_update_wes_mode(tHalHandle hHal, bool isWESModeEnabled,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set WES Mode to %d - old value is %d - roam state is %s",
 			  isWESModeEnabled,
 			  pMac->roam.configParam.isWESModeEnabled,
@@ -8219,11 +8219,11 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_SET_SCANCTRL, NO_SESSION, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set roam scan control to %d - old value is %d - roam state is %s",
 			  roamScanControl,
 			  pMac->roam.configParam.nRoamScanControl,
@@ -8233,7 +8233,7 @@ QDF_STATUS sme_set_roam_scan_control(tHalHandle hHal, uint8_t sessionId,
 							     neighborRoamState));
 		pMac->roam.configParam.nRoamScanControl = roamScanControl;
 		if (0 == roamScanControl) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully cleared roam scan cache");
 			csr_flush_cfg_bg_scan_roam_channel_list(pMac, sessionId);
 			if (pMac->roam.configParam.isRoamOffloadScanEnabled) {
@@ -8267,7 +8267,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled
 
 	if (pMac->roam.configParam.isFastRoamIniFeatureEnabled ==
 	    isFastRoamIniFeatureEnabled) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "%s: FastRoam is already enabled or disabled, nothing to do (returning) old(%d) new(%d)",
 			  __func__,
 			  pMac->roam.configParam.isFastRoamIniFeatureEnabled,
@@ -8275,7 +8275,7 @@ QDF_STATUS sme_update_is_fast_roam_ini_feature_enabled
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: FastRoamEnabled is changed from %d to %d", __func__,
 		  pMac->roam.configParam.isFastRoamIniFeatureEnabled,
 		  isFastRoamIniFeatureEnabled);
@@ -8306,7 +8306,7 @@ QDF_STATUS sme_update_is_mawc_ini_feature_enabled(tHalHandle hHal,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: MAWCEnabled is changed from %d to %d", __func__,
 			  pMac->roam.configParam.MAWCEnabled, MAWCEnabled);
 		pMac->roam.configParam.MAWCEnabled = MAWCEnabled;
@@ -8417,7 +8417,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled
 
 	if (pMac->roam.configParam.isEseIniFeatureEnabled ==
 	    isEseIniFeatureEnabled) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: ESE Mode is already enabled or disabled, nothing to do (returning) old(%d) new(%d)",
 			  __func__,
 			  pMac->roam.configParam.isEseIniFeatureEnabled,
@@ -8425,7 +8425,7 @@ QDF_STATUS sme_update_is_ese_feature_enabled
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: EseEnabled is changed from %d to %d", __func__,
 		  pMac->roam.configParam.isEseIniFeatureEnabled,
 		  isEseIniFeatureEnabled);
@@ -8466,7 +8466,7 @@ QDF_STATUS sme_update_config_fw_rssi_monitoring(tHalHandle hHal,
 	if (sme_cfg_set_int (hHal, WNI_CFG_PS_ENABLE_RSSI_MONITOR,
 						fEnableFwRssiMonitoring) == QDF_STATUS_E_FAILURE) {
 		cdf_ret_status = QDF_STATUS_E_FAILURE;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Could not pass on WNI_CFG_PS_RSSI_MONITOR to CFG");
 	}
 
@@ -8499,7 +8499,7 @@ QDF_STATUS sme_set_roam_opportunistic_scan_threshold_diff(tHalHandle hHal,
 										 sessionId,
 										 nOpportunisticThresholdDiff);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set "
 				  "opportunistic threshold diff to %d"
 				  " - old value is %d - roam state is %d",
@@ -8556,7 +8556,7 @@ QDF_STATUS sme_set_roam_rescan_rssi_diff(tHalHandle hHal,
 		status = csr_neighbor_roam_set_roam_rescan_rssi_diff(pMac, sessionId,
 								     nRoamRescanRssiDiff);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set "
 				  "opportunistic threshold diff to %d"
 				  " - old value is %d - roam state is %d",
@@ -8611,7 +8611,7 @@ QDF_STATUS sme_set_roam_bmiss_first_bcnt(tHalHandle hHal,
 		status = csr_neighbor_roam_set_roam_bmiss_first_bcnt(pMac, sessionId,
 								     nRoamBmissFirstBcnt);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set "
 				  "beacon miss first beacon count to %d"
 				  " - old value is %d - roam state is %d",
@@ -8664,7 +8664,7 @@ QDF_STATUS sme_set_roam_bmiss_final_bcnt(tHalHandle hHal,
 		status = csr_neighbor_roam_set_roam_bmiss_final_bcnt(pMac, sessionId,
 								     nRoamBmissFinalBcnt);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set "
 				  "beacon miss final beacon count to %d"
 				  " - old value is %d - roam state is %d",
@@ -8719,7 +8719,7 @@ QDF_STATUS sme_set_roam_beacon_rssi_weight(tHalHandle hHal,
 		status = csr_neighbor_roam_set_roam_beacon_rssi_weight(pMac, sessionId,
 								       nRoamBeaconRssiWeight);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set "
 				  "beacon miss final beacon count to %d"
 				  " - old value is %d - roam state is %d",
@@ -8770,7 +8770,7 @@ QDF_STATUS sme_set_neighbor_lookup_rssi_threshold
 		status = csr_neighbor_roam_set_lookup_rssi_threshold(pMac, sessionId,
 								     neighborLookupRssiThreshold);
 		if (QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  "LFR runtime successfully set Lookup threshold to %d - old value is %d - roam state is %s",
 				  neighborLookupRssiThreshold,
 				  pMac->roam.configParam.neighborRoamConfig.
@@ -8806,8 +8806,8 @@ QDF_STATUS sme_set_delay_before_vdev_stop(tHalHandle hal,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME,
-			CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME,
+			QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR param delay_before_vdev_stop changed from %d to %d"),
 			pMac->roam.configParam.neighborRoamConfig.
 			delay_before_vdev_stop,
@@ -8860,7 +8860,7 @@ QDF_STATUS sme_set_neighbor_scan_refresh_period
 		pNeighborRoamConfig =
 			&pMac->roam.configParam.neighborRoamConfig;
 		pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId];
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set roam scan refresh period to %d- old value is %d - roam state is %s",
 			  neighborScanResultsRefreshPeriod,
 			  pMac->roam.configParam.neighborRoamConfig.
@@ -8904,7 +8904,7 @@ QDF_STATUS sme_update_roam_scan_offload_enabled(tHalHandle hHal,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL
 				  ("gRoamScanOffloadEnabled is changed from %d to %d"),
 			  pMac->roam.configParam.isRoamOffloadScanEnabled,
@@ -8973,7 +8973,7 @@ QDF_STATUS sme_update_empty_scan_refresh_period(tHalHandle hHal, uint8_t session
 		pNeighborRoamConfig =
 			&pMac->roam.configParam.neighborRoamConfig;
 		pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId];
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set roam scan period to %d -old value is %d - roam state is %s",
 			  nEmptyScanRefreshPeriod,
 			  pMac->roam.configParam.neighborRoamConfig.
@@ -9018,7 +9018,7 @@ QDF_STATUS sme_set_neighbor_scan_min_chan_time(tHalHandle hHal,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set channel min dwell time to %d - old value is %d - roam state is %s",
 			  nNeighborScanMinChanTime,
 			  pMac->roam.configParam.neighborRoamConfig.
@@ -9064,7 +9064,7 @@ QDF_STATUS sme_set_neighbor_scan_max_chan_time(tHalHandle hHal, uint8_t sessionI
 		pNeighborRoamConfig =
 			&pMac->roam.configParam.neighborRoamConfig;
 		pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId];
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set channel max dwell time to %d - old value is %d - roam state is %s",
 			  nNeighborScanMaxChanTime,
 			  pMac->roam.configParam.neighborRoamConfig.
@@ -9247,7 +9247,7 @@ QDF_STATUS sme_set_neighbor_scan_period(tHalHandle hHal, uint8_t sessionId,
 		pNeighborRoamConfig =
 			&pMac->roam.configParam.neighborRoamConfig;
 		pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId];
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set neighbor scan period to %d"
 			  " - old value is %d - roam state is %s",
 			  nNeighborScanPeriod,
@@ -9364,7 +9364,7 @@ QDF_STATUS sme_change_roam_scan_channel_list(tHalHandle hHal, uint8_t sessionId,
 				break;
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR runtime successfully set roam scan channels to %s - old value is %s - roam state is %d"),
 			newChannelList, oldChannelList,
 			pMac->roam.neighborRoamInfo[sessionId].neighborRoamState);
@@ -9432,7 +9432,7 @@ QDF_STATUS sme_set_ese_roam_scan_channel_list(tHalHandle hHal,
 					curchnl_list_info->ChannelList[i]);
 			}
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"ESE roam scan chnl list successfully set to %s-old value is %s-roam state is %d",
 			newChannelList, oldChannelList,
 			pNeighborRoamInfo->neighborRoamState);
@@ -9472,7 +9472,7 @@ QDF_STATUS sme_get_roam_scan_channel_list(tHalHandle hHal,
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return status;
 	if (NULL == pNeighborRoamInfo->cfgParams.channelInfo.ChannelList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			FL("Roam Scan channel list is NOT yet initialized"));
 		*pNumChannels = 0;
 		sme_release_global_lock(&pMac->sme);
@@ -9592,7 +9592,7 @@ QDF_STATUS sme_send_tdls_link_establish_params(tHalHandle hHal,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_LINK_ESTABLISH_PARAM,
 			 sessionId,
 			 tdlsLinkEstablishParams->isOffChannelSupported));
@@ -9631,7 +9631,7 @@ QDF_STATUS sme_send_tdls_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 	tCsrTdlsSendMgmt sendTdlsReq = { {0} };
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_SEND_MGMT_FRAME,
 			 sessionId, statusCode));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -9670,11 +9670,11 @@ QDF_STATUS sme_change_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pstaParams) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s :pstaParams is NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_CHANGE_PEER_STA,
 			 sessionId, pstaParams->capability));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -9702,7 +9702,7 @@ QDF_STATUS sme_add_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_ADD_PEER_STA,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -9729,7 +9729,7 @@ QDF_STATUS sme_delete_tdls_peer_sta(tHalHandle hHal, uint8_t sessionId,
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_DEL_PEER_STA,
 			 sessionId, 0));
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -9835,7 +9835,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal,
 		return status;
 	pTdlsPeerStateParams = cdf_mem_malloc(sizeof(*pTdlsPeerStateParams));
 	if (NULL == pTdlsPeerStateParams) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("failed to allocate mem for tdls peer state param"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_NOMEM;
@@ -9872,7 +9872,7 @@ QDF_STATUS sme_update_tdls_peer_state(tHalHandle hHal,
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("invalid peer state param (%d)"),
 			peerStateParams->peerState);
 		cdf_mem_free(pTdlsPeerStateParams);
@@ -9958,7 +9958,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 	tdls_chan_switch_params *chan_switch_params = NULL;
 	cds_msg_t cds_message;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_TDLS_CHAN_SWITCH_REQ,
 			 NO_SESSION, ch_switch_params->tdls_off_channel));
 	status = sme_acquire_global_lock(&mac->sme);
@@ -9966,7 +9966,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 		return status;
 	chan_switch_params = cdf_mem_malloc(sizeof(*chan_switch_params));
 	if (NULL == chan_switch_params) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("fail to alloc mem for tdls chan switch param"));
 		sme_release_global_lock(&mac->sme);
 		return QDF_STATUS_E_FAILURE;
@@ -9983,7 +9983,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("invalid off channel command (%d)"),
 			ch_switch_params->tdls_off_ch_mode);
 		cdf_mem_free(chan_switch_params);
@@ -10000,7 +10000,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 	chan_switch_params->is_responder = ch_switch_params->is_responder;
 	chan_switch_params->oper_class = ch_switch_params->opclass;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		FL("Country Code=%s, Req offset=%d, Selected Operate Class=%d"),
 		mac->scan.countryCodeCurrent,
 		chan_switch_params->tdls_off_ch_bw_offset,
@@ -10012,7 +10012,7 @@ QDF_STATUS sme_send_tdls_chan_switch_req(tHalHandle hal,
 
 	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Message Post failed status=%d"),
 			qdf_status);
 		cdf_mem_free(chan_switch_params);
@@ -10038,7 +10038,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq,
 	if (QDF_STATUS_SUCCESS == status) {
 		if ((NULL == pCallbackfn) &&
 		    (NULL == pMac->sme.pLinkSpeedIndCb)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Indication Call back did not registered",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -10052,7 +10052,7 @@ QDF_STATUS sme_get_link_speed(tHalHandle hHal, tSirLinkSpeedInfo *lsReq,
 		cds_message.type = WMA_GET_LINK_SPEED;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Link Speed msg fail", __func__);
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -10072,7 +10072,7 @@ void sme_update_enable_ssr(tHalHandle hHal, bool enableSSR)
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "SSR level is changed %d", enableSSR);
 		/* not serializing this messsage, as this is only going
 		 * to set a variable in WMA/WDI
@@ -10200,7 +10200,7 @@ QDF_STATUS sme_set_ch_params(tHalHandle hHal, eCsrPhyMode eCsrPhyMode,
 	if (!CSR_IS_PHY_MODE_11n(eCsrPhyMode) ||
 		ch_params->ch_width == CH_WIDTH_20MHZ ||
 		QDF_STATUS_SUCCESS != csr_is_valid_channel(mac_ctx, channel)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"%s: Invalid Channel/phymode config: CB Mode disabled",
 								__func__);
 		ch_params->ch_width = CH_WIDTH_20MHZ;
@@ -10318,7 +10318,7 @@ QDF_STATUS sme_handoff_request(tHalHandle hHal,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: invoked", __func__);
 		status = csr_handoff_request(pMac, sessionId, pHandoffInfo);
 		sme_release_global_lock(&pMac->sme);
@@ -10348,7 +10348,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id,
 	if (QDF_STATUS_SUCCESS == status) {
 		request_buf = cdf_mem_malloc(sizeof(*request_buf));
 		if (NULL == request_buf) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 					FL("Not able to allocate memory for \
 					IPA_OFFLOAD_ENABLE_DISABLE"));
 			sme_release_global_lock(&pMac->sme);
@@ -10364,7 +10364,7 @@ QDF_STATUS sme_ipa_offload_enable_disable(tHalHandle hal, uint8_t session_id,
 		msg.bodyptr  = request_buf;
 		if (!QDF_IS_STATUS_SUCCESS(
 				cds_mq_post_message(CDS_MQ_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 					FL("Not able to post WMA_IPA_OFFLOAD_\
 					ENABLE_DISABLE message to WMA"));
 			cdf_mem_free(request_buf);
@@ -10411,14 +10411,14 @@ QDF_STATUS sme_lphb_config_req
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	cds_msg_t cds_message;
 
-	MTRACE(cdf_trace(QDF_MODULE_ID_SME,
+	MTRACE(qdf_trace(QDF_MODULE_ID_SME,
 			 TRACE_CODE_SME_RX_HDD_LPHB_CONFIG_REQ,
 			 NO_SESSION, lphdReq->cmd));
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_STATUS_SUCCESS == status) {
 		if ((LPHB_SET_EN_PARAMS_INDID == lphdReq->cmd) &&
 		    (NULL == pCallbackfn) && (NULL == pMac->sme.pLphbIndCb)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Indication Call back did not registered",
 				  __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -10432,7 +10432,7 @@ QDF_STATUS sme_lphb_config_req
 		cds_message.type = WMA_LPHB_CONF_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Config LPHB MSG fail", __func__);
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -10458,7 +10458,7 @@ void sme_enable_disable_split_scan(tHalHandle hHal, uint8_t nNumStaChan,
 	pMac->roam.configParam.nNumStaChanCombinedConc = nNumStaChan;
 	pMac->roam.configParam.nNumP2PChanCombinedConc = nNumP2PChan;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: SCAN nNumStaChanCombinedConc : %d,"
 		  "nNumP2PChanCombinedConc : %d ",
 		  __func__, nNumStaChan, nNumP2PChan);
@@ -10572,7 +10572,7 @@ void sme_get_command_q_status(tHalHandle hHal)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pMac is NULL", __func__);
 		return;
 	}
@@ -10705,7 +10705,7 @@ QDF_STATUS sme_ocb_set_config(tHalHandle hHal, void *context,
 
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		      FL("Error posting message to WDA: %d"), status);
 		pMac->sme.ocb_set_config_callback = callback;
 		pMac->sme.ocb_set_config_context = context;
@@ -10740,7 +10740,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc)
 
 	sme_utc = cdf_mem_malloc(sizeof(*sme_utc));
 	if (!sme_utc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Malloc failed"));
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
@@ -10752,7 +10752,7 @@ QDF_STATUS sme_ocb_set_utc_time(tHalHandle hHal, struct sir_ocb_utc *utc)
 	msg.bodyptr = sme_utc;
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post message to WDA"));
 		cdf_mem_free(utc);
 		goto end;
@@ -10788,7 +10788,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal,
 	buf = cdf_mem_malloc(sizeof(*sme_timing_advert) +
 			     timing_advert->template_length);
 	if (!buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to allocate memory for start TA"));
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
@@ -10805,7 +10805,7 @@ QDF_STATUS sme_ocb_start_timing_advert(tHalHandle hHal,
 	msg.bodyptr = buf;
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post msg to WDA"));
 		goto end;
 	}
@@ -10838,7 +10838,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal,
 
 	sme_timing_advert = cdf_mem_malloc(sizeof(*timing_advert));
 	if (!sme_timing_advert) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to allocate memory for stop TA"));
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
@@ -10850,7 +10850,7 @@ QDF_STATUS sme_ocb_stop_timing_advert(tHalHandle hHal,
 	msg.bodyptr = sme_timing_advert;
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post msg to WDA"));
 		goto end;
 	}
@@ -10925,7 +10925,7 @@ QDF_STATUS sme_ocb_get_tsf_timer(tHalHandle hHal, void *context,
 	/* Post the message to WDA */
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Error posting message to WDA: %d"), status);
 		pMac->sme.ocb_get_tsf_timer_callback = NULL;
 		pMac->sme.ocb_get_tsf_timer_context = NULL;
@@ -10983,7 +10983,7 @@ QDF_STATUS sme_dcc_get_stats(tHalHandle hHal, void *context,
 
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Error posting message to WDA: %d"), status);
 		pMac->sme.dcc_get_stats_callback = callback;
 		pMac->sme.dcc_get_stats_context = context;
@@ -11020,7 +11020,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id,
 
 	request = cdf_mem_malloc(sizeof(struct sir_dcc_clear_stats));
 	if (!request) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to allocate memory"));
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
@@ -11035,7 +11035,7 @@ QDF_STATUS sme_dcc_clear_stats(tHalHandle hHal, uint32_t vdev_id,
 
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Not able to post msg to WDA"));
 		cdf_mem_free(request);
 		goto end;
@@ -11075,7 +11075,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context,
 				  request->dcc_ndl_chan_list_len +
 				  request->dcc_ndl_active_state_list_len);
 	if (!msg_body) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to allocate memory"));
 		status = QDF_STATUS_E_NOMEM;
 		goto end;
@@ -11101,7 +11101,7 @@ QDF_STATUS sme_dcc_update_ndl(tHalHandle hHal, void *context,
 
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Error posting message to WDA: %d"), status);
 		pMac->sme.dcc_update_ndl_callback = NULL;
 		pMac->sme.dcc_update_ndl_context = NULL;
@@ -11142,12 +11142,12 @@ void sme_get_recovery_stats(tHalHandle hHal)
 {
 	uint8_t i;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "Self Recovery Stats");
 	for (i = 0; i < MAX_ACTIVE_CMD_STATS; i++) {
 		if (eSmeNoCommand !=
 		    g_self_recovery_stats.activeCmdStats[i].command) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "timestamp %llu: command 0x%0X: reason %d: session %d",
 				  g_self_recovery_stats.activeCmdStats[i].
 				  timestamp,
@@ -11176,7 +11176,7 @@ void sme_save_active_cmd_stats(tHalHandle hHal)
 	tActiveCmdStats *actv_cmd_stat = NULL;
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("pMac is NULL"));
 		return;
 	}
@@ -11212,7 +11212,7 @@ void active_list_cmd_timeout_handle(void *userData)
 {
 	if (NULL == userData)
 		return;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Active List command timeout Cmd List Count %d", __func__,
 		  csr_ll_count(&((tpAniSirGlobal) userData)->sme.
 			       smeCmdActiveList));
@@ -11222,7 +11222,7 @@ void active_list_cmd_timeout_handle(void *userData)
 		sme_save_active_cmd_stats((tHalHandle) userData);
 		cds_trigger_recovery();
 	} else {
-		CDF_BUG(0);
+		QDF_BUG(0);
 	}
 }
 
@@ -11238,7 +11238,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value)
 
 	request_buf = cdf_mem_malloc(sizeof(tSirModemPowerStateInd));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for MODEM POWER STATE IND",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -11251,7 +11251,7 @@ QDF_STATUS sme_notify_modem_power_state(tHalHandle hHal, uint32_t value)
 	msg.bodyptr = request_buf;
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_MODEM_POWER_STATE_IND message"
 			  " to WMA", __func__);
 		cdf_mem_free(request_buf);
@@ -11277,7 +11277,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId,
 
 	pHtOpMode = cdf_mem_malloc(sizeof(tUpdateVHTOpMode));
 	if (NULL == pHtOpMode) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for setting OP mode",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -11294,7 +11294,7 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId,
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Invalid OP mode", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -11309,14 +11309,14 @@ QDF_STATUS sme_notify_ht2040_mode(tHalHandle hHal, uint16_t staId,
 	msg.bodyptr = pHtOpMode;
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_UPDATE_OP_MODE message"
 			  " to WMA", __func__);
 		cdf_mem_free(pHtOpMode);
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: Notifed FW about OP mode: %d for staId=%d",
 		  __func__, pHtOpMode->opMode, staId);
 
@@ -11343,7 +11343,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	ePhyChanBondState cbMode;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: Update HT operation beacon IE, channel_type=%d",
 		  __func__, channel_type);
 
@@ -11358,7 +11358,7 @@ QDF_STATUS sme_set_ht2040_mode(tHalHandle hHal, uint8_t sessionId,
 		cbMode = PHY_DOUBLE_CHANNEL_LOW_PRIMARY;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s:Error!!! Invalid HT20/40 mode !", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -11389,7 +11389,7 @@ QDF_STATUS sme_set_phy_cb_mode24_g(tHalHandle hHal, ePhyChanBondState phyCBMode)
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == pMac) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: invalid context", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -11412,16 +11412,16 @@ QDF_STATUS sme_set_idle_powersave_config(void *cds_context,
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
 	if (NULL == wmaContext) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: wmaContext is NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  " Idle Ps Set Value %d", value);
 
 	pMac->imps_enabled = false;
 	if (QDF_STATUS_SUCCESS != wma_set_idle_ps_config(wmaContext, value)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  " Failed to Set Idle Ps Value %d", value);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -11436,7 +11436,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, session_id);
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pSession is NULL", __func__);
 		return -EIO;
 	}
@@ -11451,7 +11451,7 @@ int16_t sme_get_ht_config(tHalHandle hHal, uint8_t session_id, uint16_t ht_capab
 	case WNI_CFG_HT_CAP_INFO_SHORT_GI_40MHZ:
 		return pSession->htConfig.ht_sgi;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "invalid ht capability");
 		return -EIO;
 	}
@@ -11464,13 +11464,13 @@ int sme_update_ht_config(tHalHandle hHal, uint8_t sessionId, uint16_t htCapab,
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: pSession is NULL", __func__);
 		return -EIO;
 	}
 
 	if (QDF_STATUS_SUCCESS != wma_set_htconfig(sessionId, htCapab, value)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to set ht capability in target");
 		return -EIO;
 	}
@@ -11511,7 +11511,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal,
 	tSirRateUpdateInd *rate_upd = cdf_mem_malloc(sizeof(tSirRateUpdateInd));
 
 	if (rate_upd == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Rate update struct alloc failed");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -11532,7 +11532,7 @@ QDF_STATUS sme_send_rate_update_ind(tHalHandle hHal,
 
 		if (!QDF_IS_STATUS_SUCCESS
 			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able "
 				  "to post WMA_SET_RMC_RATE_IND to WMA!",
 				  __func__);
@@ -11605,7 +11605,7 @@ QDF_STATUS sme_set_auto_shutdown_cb(tHalHandle hHal, void (*pCallbackfn)(void)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Plug in Auto shutdown event callback", __func__);
 
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -11639,7 +11639,7 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val)
 		auto_sh_cmd = (tSirAutoShutdownCmdParams *)
 			      cdf_mem_malloc(sizeof(tSirAutoShutdownCmdParams));
 		if (auto_sh_cmd == NULL) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s Request Buffer Alloc Fail", __func__);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_NOMEM;
@@ -11652,13 +11652,13 @@ QDF_STATUS sme_set_auto_shutdown_timer(tHalHandle hHal, uint32_t timer_val)
 		cds_message.type = WMA_SET_AUTO_SHUTDOWN_TIMER_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Auto shutdown MSG fail", __func__);
 			cdf_mem_free(auto_sh_cmd);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_FAILURE;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: Posted Auto shutdown MSG", __func__);
 		sme_release_global_lock(&pMac->sme);
 	}
@@ -11683,7 +11683,7 @@ QDF_STATUS sme_add_ch_avoid_callback
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Plug in CH AVOID CB", __func__);
 
 	status = sme_acquire_global_lock(&pMac->sme);
@@ -11717,7 +11717,7 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal)
 		cauReq = (tSirChAvoidUpdateReq *)
 			 cdf_mem_malloc(sizeof(tSirChAvoidUpdateReq));
 		if (NULL == cauReq) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "%s Request Buffer Alloc Fail", __func__);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_NOMEM;
@@ -11730,14 +11730,14 @@ QDF_STATUS sme_ch_avoid_update_req(tHalHandle hHal)
 		cds_message.type = WMA_CH_AVOID_UPDATE_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Post Ch Avoid Update MSG fail",
 				  __func__);
 			cdf_mem_free(cauReq);
 			sme_release_global_lock(&pMac->sme);
 			return QDF_STATUS_E_FAILURE;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: Posted Ch Avoid Update MSG", __func__);
 		sme_release_global_lock(&pMac->sme);
 	}
@@ -11765,7 +11765,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type)
 
 	val = cdf_mem_malloc(sizeof(*val));
 	if (NULL == val || NULL == mac_ptr) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: Invalid pointer", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -11778,7 +11778,7 @@ QDF_STATUS sme_set_miracast(tHalHandle hal, uint8_t filter_type)
 
 	if (!QDF_IS_STATUS_SUCCESS(
 				cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		    "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!",
 		    __func__);
 		cdf_mem_free(val);
@@ -11806,7 +11806,7 @@ QDF_STATUS sme_set_mas(uint32_t val)
 
 	ptr_val = cdf_mem_malloc(sizeof(*ptr_val));
 	if (NULL == ptr_val) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: could not allocate ptr_val", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -11819,7 +11819,7 @@ QDF_STATUS sme_set_mas(uint32_t val)
 
 	if (!QDF_IS_STATUS_SUCCESS(
 				cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		    "%s: Not able to post WDA_SET_MAS_ENABLE_DISABLE to WMA!",
 		    __func__);
 		cdf_mem_free(ptr_val);
@@ -11887,14 +11887,14 @@ QDF_STATUS sme_process_channel_change_resp(tpAniSirGlobal pMac,
 			pChnlParams->ch_width;
 
 		if (pChnlParams->status == QDF_STATUS_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Received success eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]",
 				  SessionId);
 			proam_info.channelChangeRespEvent->channelChangeStatus =
 				1;
 			roamResult = eCSR_ROAM_RESULT_CHANNEL_CHANGE_SUCCESS;
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 				  "sapdfs: Received failure eWNI_SME_CHANNEL_CHANGE_RSP for sessionId[%d]",
 				  SessionId);
 			proam_info.channelChangeRespEvent->channelChangeStatus =
@@ -11978,7 +11978,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam
 
 	pWmaParam = (t_thermal_mgmt *) cdf_mem_malloc(sizeof(t_thermal_mgmt));
 	if (NULL == pWmaParam) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: could not allocate tThermalMgmt", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -12010,7 +12010,7 @@ QDF_STATUS sme_init_thermal_info(tHalHandle hHal, tSmeThermalParams thermalParam
 
 		if (!QDF_IS_STATUS_SUCCESS
 			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post WMA_SET_THERMAL_INFO_CMD to WMA!",
 				  __func__);
 			cdf_mem_free(pWmaParam);
@@ -12061,7 +12061,7 @@ QDF_STATUS sme_set_thermal_level(tHalHandle hal, uint8_t level)
 
 		qdf_status =  cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				   "%s: Not able to post WMA_SET_THERMAL_LEVEL to WMA!",
 				   __func__);
 			sme_release_global_lock(&pMac->sme);
@@ -12090,7 +12090,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx)
 
 	tx_power_limit = cdf_mem_malloc(sizeof(*tx_power_limit));
 	if (!tx_power_limit) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Memory allocation for TxPowerLimit failed!",
 			  __func__);
 		return QDF_STATUS_E_FAILURE;
@@ -12106,7 +12106,7 @@ QDF_STATUS sme_txpower_limit(tHalHandle hHal, tSirTxPowerLimit *psmetx)
 
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_TX_POWER_LIMIT",
 				  __func__);
 			status = QDF_STATUS_E_FAILURE;
@@ -12233,7 +12233,7 @@ QDF_STATUS sme_stats_ext_request(uint8_t session_id, tpStatsExtRequestReq input)
 	msg.bodyptr = data;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post WMA_STATS_EXT_REQUEST message to WMA",
 			  __func__);
 		cdf_mem_free(data);
@@ -12298,7 +12298,7 @@ QDF_STATUS sme_update_dfs_scan_mode(tHalHandle hHal, uint8_t sessionId,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR runtime successfully set AllowDFSChannelRoam Mode to "
 			  "%d - old value is %d - roam state is %s",
 			  allowDFSChannelRoam,
@@ -12424,13 +12424,13 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal,
 		return status;
 	pCsrSession = CSR_GET_SESSION(pMac, sessionId);
 	if (pCsrSession == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Session lookup fails for CSR session"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Invalid session Id %u"), sessionId);
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
@@ -12441,14 +12441,14 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal,
 				&peSessionId);
 
 	if (pSession == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL(" Session lookup fails for BSSID"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (!pSession->QosMapSet.present) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 				FL("QOS Mapping IE not present"));
 		sme_release_global_lock(&pMac->sme);
 		return QDF_STATUS_E_FAILURE;
@@ -12461,8 +12461,8 @@ QDF_STATUS sme_update_dsc_pto_up_mapping(tHalHandle hHal,
 				&& (pSession->QosMapSet.dscp_range[i][1] ==
 							255)) {
 				dscpmapping[j] = 0;
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_ERROR,
 					FL("User Priority %d isn't used"), i);
 				break;
 			} else {
@@ -12533,13 +12533,13 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 	uint32_t totValidChannels = WNI_CFG_VALID_CHANNEL_LIST_LEN;
 
 	if (!aValidChannels || !pNumChannels) {
-		sms_log(pMac, CDF_TRACE_LEVEL_ERROR,
+		sms_log(pMac, QDF_TRACE_LEVEL_ERROR,
 			FL("Output channel list/NumChannels is NULL"));
 		return QDF_STATUS_E_INVAL;
 	}
 
 	if ((wifiBand < WIFI_BAND_UNSPECIFIED) || (wifiBand >= WIFI_BAND_MAX)) {
-		sms_log(pMac, CDF_TRACE_LEVEL_ERROR,
+		sms_log(pMac, QDF_TRACE_LEVEL_ERROR,
 			FL("Invalid wifiBand (%d)"), wifiBand);
 		return QDF_STATUS_E_INVAL;
 	}
@@ -12547,14 +12547,14 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 	status = sme_get_cfg_valid_channels(hHal, &chanList[0],
 			&totValidChannels);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		sms_log(pMac, CDF_TRACE_LEVEL_ERROR,
+		sms_log(pMac, QDF_TRACE_LEVEL_ERROR,
 			FL("Fail to get valid channel list (err=%d)"), status);
 		return status;
 	}
 
 	switch (wifiBand) {
 	case WIFI_BAND_UNSPECIFIED:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("Unspec Band, return all (%d) valid channels"),
 			totValidChannels);
 		numChannels = totValidChannels;
@@ -12564,7 +12564,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_BG:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_BG (2.4 GHz)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if (CDS_IS_CHANNEL_24GHZ(chanList[i])) {
@@ -12575,7 +12575,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_A:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_A (5 GHz without DFS)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if (CDS_IS_CHANNEL_5GHZ(chanList[i]) &&
@@ -12587,7 +12587,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_ABG:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_ABG (2.4 GHz + 5 GHz; no DFS)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if ((CDS_IS_CHANNEL_24GHZ(chanList[i]) ||
@@ -12600,7 +12600,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_A_DFS_ONLY:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_A_DFS (5 GHz DFS only)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if (CDS_IS_CHANNEL_5GHZ(chanList[i]) &&
@@ -12612,7 +12612,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_A_WITH_DFS:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_A_WITH_DFS (5 GHz with DFS)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if (CDS_IS_CHANNEL_5GHZ(chanList[i])) {
@@ -12623,7 +12623,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	case WIFI_BAND_ABG_WITH_DFS:
-		sms_log(pMac, CDF_TRACE_LEVEL_INFO,
+		sms_log(pMac, QDF_TRACE_LEVEL_INFO,
 			FL("WIFI_BAND_ABG_WITH_DFS (2.4 GHz+5 GHz with DFS)"));
 		for (i = 0; i < totValidChannels; i++) {
 			if (CDS_IS_CHANNEL_24GHZ(chanList[i]) ||
@@ -12635,7 +12635,7 @@ QDF_STATUS sme_get_valid_channels_by_band(tHalHandle hHal,
 		break;
 
 	default:
-		sms_log(pMac, CDF_TRACE_LEVEL_ERROR,
+		sms_log(pMac, QDF_TRACE_LEVEL_ERROR,
 			FL("Unknown wifiBand (%d))"), wifiBand);
 		return QDF_STATUS_E_INVAL;
 		break;
@@ -13149,18 +13149,18 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal,
 	cds_msg_t cds_message;
 	tSirLLStatsClearReq *clear_stats_req;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "staId = %u", pclearStatsReq->staId);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "statsClearReqMask = 0x%X",
 		  pclearStatsReq->statsClearReqMask);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "stopReq = %u", pclearStatsReq->stopReq);
 
 	clear_stats_req = cdf_mem_malloc(sizeof(*clear_stats_req));
 
 	if (!clear_stats_req) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for WMA_LL_STATS_CLEAR_REQ",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13174,7 +13174,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal,
 		cds_message.type = WMA_LINK_LAYER_STATS_CLEAR_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_CLEAR_REQ",
 				  __func__);
 			cdf_mem_free(clear_stats_req);
@@ -13182,7 +13182,7 @@ QDF_STATUS sme_ll_stats_clear_req(tHalHandle hHal,
 		}
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: "
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: "
 			  "sme_acquire_global_lock error", __func__);
 		cdf_mem_free(clear_stats_req);
 		status = QDF_STATUS_E_FAILURE;
@@ -13206,17 +13206,17 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq
 	cds_msg_t cds_message;
 	tSirLLStatsSetReq *set_stats_req;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s:  MPDU Size = %u", __func__,
 		  psetStatsReq->mpduSizeThreshold);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  " Aggressive Stats Collections = %u",
 		  psetStatsReq->aggressiveStatisticsGathering);
 
 	set_stats_req = cdf_mem_malloc(sizeof(*set_stats_req));
 
 	if (!set_stats_req) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for WMA_LL_STATS_SET_REQ",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13230,7 +13230,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq
 		cds_message.type = WMA_LINK_LAYER_STATS_SET_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_SET_REQ",
 				  __func__);
 			cdf_mem_free(set_stats_req);
@@ -13238,7 +13238,7 @@ QDF_STATUS sme_ll_stats_set_req(tHalHandle hHal, tSirLLStatsSetReq *psetStatsReq
 		}
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: "
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: "
 			  "sme_acquire_global_lock error", __func__);
 		cdf_mem_free(set_stats_req);
 		status = QDF_STATUS_E_FAILURE;
@@ -13262,17 +13262,17 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq
 	cds_msg_t cds_message;
 	tSirLLStatsGetReq *get_stats_req;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "reqId = %u", pgetStatsReq->reqId);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "staId = %u", pgetStatsReq->staId);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "Stats Type = %u", pgetStatsReq->paramIdMask);
 
 	get_stats_req = cdf_mem_malloc(sizeof(*get_stats_req));
 
 	if (!get_stats_req) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for WMA_LL_STATS_GET_REQ",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13286,7 +13286,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq
 		cds_message.type = WMA_LINK_LAYER_STATS_GET_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: not able to post WMA_LL_STATS_GET_REQ",
 				  __func__);
 
@@ -13296,7 +13296,7 @@ QDF_STATUS sme_ll_stats_get_req(tHalHandle hHal, tSirLLStatsGetReq *pgetStatsReq
 		}
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: "
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: "
 			  "sme_acquire_global_lock error", __func__);
 		cdf_mem_free(get_stats_req);
 		status = QDF_STATUS_E_FAILURE;
@@ -13325,7 +13325,7 @@ QDF_STATUS sme_set_link_layer_stats_ind_cb
 		pMac->sme.pLinkLayerStatsIndCallback = callback_routine;
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR, "%s: "
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: "
 			  "sme_acquire_global_lock error", __func__);
 	}
 
@@ -13357,7 +13357,7 @@ QDF_STATUS sme_fw_mem_dump_register_cb(tHalHandle hal,
 		pmac->sme.fw_dump_callback = callback_routine;
 		sme_release_global_lock(&pmac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("sme_acquire_global_lock error"));
 	}
 
@@ -13392,7 +13392,7 @@ QDF_STATUS sme_fw_mem_dump_unregister_cb(tHalHandle hal)
 		pmac->sme.fw_dump_callback = NULL;
 		sme_release_global_lock(&pmac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("sme_acquire_global_lock error"));
 	}
 
@@ -13424,7 +13424,7 @@ QDF_STATUS sme_update_roam_offload_enabled(tHalHandle hHal,
 
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: LFR3:gRoamOffloadEnabled is changed from %d to %d",
 			  __func__, pMac->roam.configParam.isRoamOffloadEnabled,
 			  nRoamOffloadEnabled);
@@ -13458,7 +13458,7 @@ QDF_STATUS sme_update_roam_key_mgmt_offload_enabled(tHalHandle hHal,
 	status = sme_acquire_global_lock(&pMac->sme);
 	if (QDF_IS_STATUS_SUCCESS(status)) {
 		if (CSR_IS_SESSION_VALID(pMac, sessionId)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "%s: LFR3: KeyMgmtOffloadEnabled changed to %d",
 				  __func__, nRoamKeyMgmtOffloadEnabled);
 			status = csr_roam_set_key_mgmt_offload(pMac,
@@ -13496,7 +13496,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal,
 	if (QDF_STATUS_SUCCESS == status) {
 		if ((NULL == pCallbackfn) &&
 		    (NULL == pMac->sme.pGetTemperatureCb)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL
 					  ("Indication Call back did not registered"));
 			sme_release_global_lock(&pMac->sme);
@@ -13510,7 +13510,7 @@ QDF_STATUS sme_get_temperature(tHalHandle hHal,
 		cds_message.type = WMA_GET_TEMPERATURE_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Post Get Temperature msg fail"));
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -13540,7 +13540,7 @@ QDF_STATUS sme_set_scanning_mac_oui(tHalHandle hHal, tSirScanMacOui *pScanMacOui
 		cds_message.type = WMA_SET_SCAN_MAC_OUI_REQ;
 		qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Msg post Set Scan Mac OUI failed"));
 			status = QDF_STATUS_E_FAILURE;
 		}
@@ -13568,7 +13568,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal,
 	pSmeDhcpSrvInfo = cdf_mem_malloc(sizeof(*pSmeDhcpSrvInfo));
 
 	if (!pSmeDhcpSrvInfo) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for WMA_SET_DHCP_SERVER_OFFLOAD_CMD",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13584,7 +13584,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal,
 
 		if (!QDF_IS_STATUS_SUCCESS
 			    (cds_mq_post_message(QDF_MODULE_ID_WMA, &cds_message))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post WMA_SET_DHCP_SERVER_OFFLOAD_CMD to WMA!",
 				  __func__);
 			cdf_mem_free(pSmeDhcpSrvInfo);
@@ -13592,7 +13592,7 @@ QDF_STATUS sme_set_dhcp_srv_offload(tHalHandle hHal,
 		}
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_acquire_global_lock error!", __func__);
 		cdf_mem_free(pSmeDhcpSrvInfo);
 	}
@@ -13620,7 +13620,7 @@ QDF_STATUS sme_set_led_flashing(tHalHandle hHal, uint8_t type,
 
 	ledflashing = cdf_mem_malloc(sizeof(*ledflashing));
 	if (!ledflashing) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Not able to allocate memory for WMA_LED_TIMING_REQ"));
 		return QDF_STATUS_E_NOMEM;
@@ -13702,7 +13702,7 @@ bool sme_validate_sap_channel_switch(tHalHandle hal,
 						cc_switch_mode);
 		sme_release_global_lock(&mac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("sme_acquire_global_lock error!"));
 		session->ch_switch_in_progress = false;
 		return false;
@@ -13734,7 +13734,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id,
 	stats_factor = cdf_mem_malloc(sizeof(*stats_factor));
 
 	if (!stats_factor) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for SIR_HAL_CONFIG_STATS_FACTOR",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13753,7 +13753,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id,
 
 		if (!QDF_IS_STATUS_SUCCESS(
 			    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post SIR_HAL_CONFIG_STATS_FACTOR to WMA!",
 				  __func__);
 			cdf_mem_free(stats_factor);
@@ -13761,7 +13761,7 @@ QDF_STATUS sme_configure_stats_avg_factor(tHalHandle hal, uint8_t session_id,
 		}
 		sme_release_global_lock(&mac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_acquire_global_lock error!",
 			  __func__);
 		cdf_mem_free(stats_factor);
@@ -13791,7 +13791,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id,
 	g_time = cdf_mem_malloc(sizeof(*g_time));
 
 	if (!g_time) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to allocate memory for SIR_HAL_CONFIG_GUARD_TIME",
 			  __func__);
 		return QDF_STATUS_E_NOMEM;
@@ -13810,7 +13810,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id,
 
 		if (!QDF_IS_STATUS_SUCCESS(
 			    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post SIR_HAL_CONFIG_GUARD_TIME to WMA!",
 				  __func__);
 			cdf_mem_free(g_time);
@@ -13818,7 +13818,7 @@ QDF_STATUS sme_configure_guard_time(tHalHandle hal, uint8_t session_id,
 		}
 		sme_release_global_lock(&mac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_acquire_global_lock error!",
 			  __func__);
 		cdf_mem_free(g_time);
@@ -13847,8 +13847,8 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id,
 
 	iwcmd = cdf_mem_malloc(sizeof(*iwcmd));
 	if (NULL == iwcmd) {
-		CDF_TRACE(QDF_MODULE_ID_SME,
-			  CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME,
+			  QDF_TRACE_LEVEL_FATAL,
 			  "%s: cdf_mem_alloc failed", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -13868,7 +13868,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id,
 
 		if (!QDF_IS_STATUS_SUCCESS(
 			    cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: Not able to post GEN_PARAM_DYNAMIC_DTIM to WMA!",
 				  __func__);
 			cdf_mem_free(iwcmd);
@@ -13876,7 +13876,7 @@ QDF_STATUS sme_configure_modulated_dtim(tHalHandle h_hal, uint8_t session_id,
 		}
 		sme_release_global_lock(&mac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: sme_acquire_global_lock error!",
 			  __func__);
 		cdf_mem_free(iwcmd);
@@ -14025,14 +14025,14 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 	enum uapsd_ac access_category;
 
 	if (!psb) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"No need to configure auto trigger:psb is 0");
 		return QDF_STATUS_SUCCESS;
 	}
 
 	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma_handle) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 					"wma_handle is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -14062,7 +14062,7 @@ QDF_STATUS sme_enable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 
 	if (QDF_STATUS_SUCCESS !=
 	    wma_trigger_uapsd_params(wma_handle, sessionId, &uapsd_params)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"Failed to Trigger Uapsd params for sessionId %d",
 			    sessionId);
 		return QDF_STATUS_E_FAILURE;
@@ -14105,13 +14105,13 @@ QDF_STATUS sme_disable_uapsd_for_ac(void *cds_ctx, uint8_t sta_id,
 
 	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma_handle) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"wma handle is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (QDF_STATUS_SUCCESS !=
 	    wma_disable_uapsd_per_ac(wma_handle, sessionId, access_category)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"Failed to disable uapsd for ac %d for sessionId %d",
 			    ac, sessionId);
 		return QDF_STATUS_E_FAILURE;
@@ -14291,26 +14291,26 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req)
 
 	send_req = cdf_mem_malloc(sizeof(*send_req));
 	if (!send_req) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Memory allocation failed for WDA_FW_MEM_DUMP"));
 		return QDF_STATUS_E_FAILURE;
 	}
 	cdf_mem_copy(send_req, recvd_req, sizeof(*send_req));
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  FL("request_id:%d num_seg:%d"),
 		  send_req->request_id, send_req->num_seg);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  FL("Segment Information"));
 	for (loop = 0; loop < send_req->num_seg; loop++) {
 		seg_req = send_req->segment[loop];
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("seg_number:%d"), loop);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("seg_id:%d start_addr_lo:0x%x start_addr_hi:0x%x"),
 			  seg_req.seg_id, seg_req.seg_start_addr_lo,
 			  seg_req.seg_start_addr_hi);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("seg_length:%d dst_addr_lo:0x%x dst_addr_hi:0x%x"),
 			  seg_req.seg_length, seg_req.dst_addr_lo,
 			  seg_req.dst_addr_hi);
@@ -14323,14 +14323,14 @@ QDF_STATUS sme_fw_mem_dump(tHalHandle hHal, void *recvd_req)
 
 		qdf_status = cds_mq_post_message(QDF_MODULE_ID_WMA, &msg);
 		if (QDF_STATUS_SUCCESS != qdf_status) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Not able to post WMA_FW_MEM_DUMP"));
 			cdf_mem_free(send_req);
 			status = QDF_STATUS_E_FAILURE;
 		}
 		sme_release_global_lock(&pMac->sme);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Failed to acquire SME Global Lock"));
 		cdf_mem_free(send_req);
 		status = QDF_STATUS_E_FAILURE;
@@ -14570,7 +14570,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal,
 
 	request_buf = cdf_mem_malloc(sizeof(*request_buf));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to allocate memory for gw param update request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -14582,7 +14582,7 @@ QDF_STATUS sme_gateway_param_update(tHalHandle Hal,
 	cds_message.bodyptr = request_buf;
 	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &cds_message);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post WMA_GW_PARAM_UPDATE_REQ message to HAL"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -14608,7 +14608,7 @@ QDF_STATUS sme_set_peer_authorized(uint8_t *peer_addr,
 
 	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma_handle) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"wma handle is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -14687,7 +14687,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle,
 		nr_info   = &mac_ctx->roam.neighborRoamInfo[session_id];
 		switch (notify_id) {
 		case eCSR_HI_RSSI_SCAN_MAXCOUNT_ID:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				"%s: gRoamScanHirssiMaxCount %d => %d",
 				__func__, nr_config->nhi_rssi_scan_max_count,
 				val);
@@ -14697,7 +14697,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle,
 		break;
 
 		case eCSR_HI_RSSI_SCAN_RSSI_DELTA_ID:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("gRoamScanHiRssiDelta %d => %d"),
 				nr_config->nhi_rssi_scan_rssi_delta,
 				val);
@@ -14707,7 +14707,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle,
 			break;
 
 		case eCSR_HI_RSSI_SCAN_DELAY_ID:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("gRoamScanHiRssiDelay %d => %d"),
 				nr_config->nhi_rssi_scan_delay,
 				val);
@@ -14717,7 +14717,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle,
 			break;
 
 		case eCSR_HI_RSSI_SCAN_RSSI_UB_ID:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("gRoamScanHiRssiUpperBound %d => %d"),
 				nr_config->nhi_rssi_scan_rssi_ub,
 				val);
@@ -14727,7 +14727,7 @@ QDF_STATUS sme_update_roam_scan_hi_rssi_scan_params(tHalHandle hal_handle,
 			break;
 
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("invalid parameter notify_id %d"),
 				notify_id);
 			status = QDF_STATUS_E_INVAL;
@@ -14762,7 +14762,7 @@ void sme_update_tgt_services(tHalHandle hal, struct wma_tgt_services *cfg)
 	mac_ctx->lteCoexAntShare = cfg->lte_coex_ant_share;
 	mac_ctx->beacon_offload = cfg->beacon_offload;
 	mac_ctx->pmf_offload = cfg->pmf_offload;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		FL("mac_ctx->pmf_offload: %d"), mac_ctx->pmf_offload);
 
 	return;
@@ -14833,7 +14833,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time,
 
 	egap_params = cdf_mem_malloc(sizeof(*egap_params));
 	if (NULL == egap_params) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: fail to alloc egap_params", __func__);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -14847,7 +14847,7 @@ QDF_STATUS sme_send_egap_conf_params(uint32_t enable, uint32_t inactivity_time,
 	message.bodyptr = egap_params;
 	status = cds_mq_post_message(QDF_MODULE_ID_WMA, &message);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"%s: Not able to post msg to WMA!", __func__);
 
 		cdf_mem_free(egap_params);
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index c533602fef2b..3b9aba549253 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -548,7 +548,7 @@ void sme_ft_reset(tHalHandle hHal, uint32_t sessionId)
 	tCsrRoamSession *pSession = NULL;
 
 	if (pMac == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("pMac is NULL"));
 		return;
 	}
diff --git a/core/sme/src/common/sme_power_save.c b/core/sme/src/common/sme_power_save.c
index 8c382fb3e906..78ccd346e5a4 100644
--- a/core/sme/src/common/sme_power_save.c
+++ b/core/sme/src/common/sme_power_save.c
@@ -53,7 +53,7 @@ QDF_STATUS sme_post_ps_msg_to_wma(uint16_t type, void *body)
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(
 				QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: Posting message %d failed",
 				__func__, type);
 		cdf_mem_free(body);
@@ -87,7 +87,7 @@ QDF_STATUS sme_ps_enable_ps_req_params(tpAniSirGlobal mac_ctx,
 	status = sme_post_ps_msg_to_wma(WMA_ENTER_PS_REQ, enable_ps_req_params);
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return QDF_STATUS_E_FAILURE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		FL("Message WMA_ENTER_PS_REQ Successfully sent to WMA"));
 	return QDF_STATUS_SUCCESS;
 }
@@ -118,7 +118,7 @@ QDF_STATUS sme_ps_disable_ps_req_params(tpAniSirGlobal mac_ctx,
 	status = sme_post_ps_msg_to_wma(WMA_EXIT_PS_REQ, disable_ps_req_params);
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return QDF_STATUS_E_FAILURE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Message WMA_EXIT_PS_REQ Successfully sent to WMA"));
 	return QDF_STATUS_SUCCESS;
 }
@@ -190,7 +190,7 @@ QDF_STATUS sme_ps_enable_uapsd_req_params(tpAniSirGlobal mac_ctx,
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return QDF_STATUS_E_FAILURE;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		    FL("Msg WMA_ENABLE_UAPSD_REQ Successfully sent to WMA"));
 	return QDF_STATUS_SUCCESS;
 }
@@ -222,7 +222,7 @@ QDF_STATUS sme_ps_disable_uapsd_req_params(tpAniSirGlobal mac_ctx,
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		return QDF_STATUS_E_FAILURE;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		FL("Message WMA_DISABLE_UAPSD_REQ Successfully sent to WMA"));
 	return QDF_STATUS_SUCCESS;
 }
@@ -329,7 +329,7 @@ QDF_STATUS sme_ps_enter_wowl_req_params(tpAniSirGlobal mac_ctx,
 
 	if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_ENTER_REQ,
 							hal_wowl_params)){
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Msg WMA_WOWL_ENTER_REQ Successfully sent to WMA"));
 		return QDF_STATUS_SUCCESS;
 	} else
@@ -364,7 +364,7 @@ QDF_STATUS sme_ps_exit_wowl_req_params(tpAniSirGlobal mac_ctx,
 
 	if (QDF_STATUS_SUCCESS == sme_post_ps_msg_to_wma(WMA_WOWL_EXIT_REQ,
 							hal_wowl_msg)){
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Msg WMA_WOWL_EXIT_REQ Successfully sent to WMA"));
 		return QDF_STATUS_SUCCESS;
 	}
@@ -391,7 +391,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id,
 		sms_log(mac_ctx, LOGE, "Invalid Session_id %x", session_id);
 		return eSIR_FAILURE;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Power Save command %d"), command);
 	switch (command) {
 	case SME_PS_ENABLE:
@@ -420,7 +420,7 @@ QDF_STATUS sme_ps_process_command(tpAniSirGlobal mac_ctx, uint32_t session_id,
 		break;
 	}
 	if (status != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to enter in PS, Command: %d"), command);
 	}
 	return status;
@@ -699,14 +699,14 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx,
 	 */
 	status = dot11f_get_packed_probe_request_size(mac_ctx, &pr, &payload);
 	if (DOT11F_FAILED(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to calculate the packed size for a Probe Request (0x%08x)."),
 				  status);
 
 		/* We'll fall back on the worst case scenario: */
 		payload = sizeof(tDot11fProbeRequest);
 	} else if (DOT11F_WARNED(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("There were warnings while calculating the packed size for a Probe Request (0x%08x)."),
 			  status);
 	}
@@ -722,7 +722,7 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx,
 					     self_mac_addr);
 
 	if (eSIR_SUCCESS != sir_status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		FL("Failed to populate the buffer descriptor for a Probe Request (%d)."),
 			sir_status);
 		return sir_status;      /* allocated! */
@@ -732,11 +732,11 @@ sme_prepare_probe_req_template(tpAniSirGlobal mac_ctx,
 					    sizeof(tSirMacMgmtHdr),
 					    payload, &payload);
 	if (DOT11F_FAILED(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to pack a Probe Request (0x%08x).", status);
 		return eSIR_FAILURE;    /* allocated! */
 	} else if (DOT11F_WARNED(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "There were warnings while packing a Probe Request");
 	}
 
@@ -764,11 +764,11 @@ void sme_set_pno_channel_prediction(tpSirPNOScanReq request_buf,
 		mac_ctx->roam.configParam.stationary_thresh;
 	request_buf->channel_prediction_full_scan =
 		mac_ctx->roam.configParam.channel_prediction_full_scan;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("channel_prediction: %d, top_k_num_of_channels: %d"),
 			request_buf->pno_channel_prediction,
 			request_buf->top_k_num_of_channels);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("stationary_thresh: %d, ch_predict_full_scan: %d"),
 			request_buf->stationary_thresh,
 			request_buf->channel_prediction_full_scan);
@@ -786,11 +786,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 	uint8_t uc_dot11_mode;
 
 	if (NULL == session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: session is NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			"%s: SSID = 0x%08x%08x%08x%08x%08x%08x%08x%08x, 0x%08x%08x%08x%08x%08x%08x%08x%08x", __func__,
 			*((uint32_t *) &request->aNetworks[0].ssId.ssId[0]),
 			*((uint32_t *) &request->aNetworks[0].ssId.ssId[4]),
@@ -810,14 +810,14 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 			*((uint32_t *) &request->aNetworks[1].ssId.ssId[28]));
 
 	if (!session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: session is NULL", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	request_buf = cdf_mem_malloc(sizeof(tSirPNOScanReq));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to allocate memory for PNO request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -854,13 +854,13 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 					request->us24GProbeTemplateLen);
 			request_buf->us24GProbeTemplateLen +=
 				request->us24GProbeTemplateLen;
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_INFO,
 				FL("request->us24GProbeTemplateLen = %d"),
 				request->us24GProbeTemplateLen);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_INFO,
 				FL("Extra ie discarded on 2.4G, IE len = %d"),
 				request->us24GProbeTemplateLen);
 		}
@@ -887,11 +887,11 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 					request->us5GProbeTemplateLen);
 			request_buf->us5GProbeTemplateLen +=
 				request->us5GProbeTemplateLen;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("request_buf->us5GProbeTemplateLen = %d"),
 				request->us5GProbeTemplateLen);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				FL("Extra IE discarded on 5G, IE length = %d"),
 				request->us5GProbeTemplateLen);
 		}
@@ -933,7 +933,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 	msg.bodyptr = request_buf;
 	if (!QDF_IS_STATUS_SUCCESS
 			(cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post WMA_SET_PNO_REQ message to WMA"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -945,7 +945,7 @@ QDF_STATUS sme_set_ps_preferred_network_list(tHalHandle hal_ctx,
 	mac_ctx->sme.preferred_network_found_ind_cb_ctx =
 		callback_context;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "-%s", __func__);
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "-%s", __func__);
 
 	return QDF_STATUS_SUCCESS;
 }
@@ -969,7 +969,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 	tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal_ctx);
 	tCsrRoamSession *session = CSR_GET_SESSION(mac_ctx, session_id);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			"%s: IP address = %d.%d.%d.%d", __func__,
 			request->params.hostIpv4Addr[0],
 			request->params.hostIpv4Addr[1],
@@ -977,14 +977,14 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 			request->params.hostIpv4Addr[3]);
 
 	if (NULL == session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s: SESSION not Found", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	request_buf = cdf_mem_malloc(sizeof(tSirHostOffloadReq));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		   FL("Not able to allocate memory for host offload request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -998,7 +998,7 @@ QDF_STATUS sme_set_ps_host_offload(tHalHandle hal_ctx,
 	msg.bodyptr = request_buf;
 	if (QDF_STATUS_SUCCESS !=
 			cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		      FL("Not able to post WMA_SET_HOST_OFFLOAD msg to WMA"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
@@ -1035,7 +1035,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 
 	request_buf = cdf_mem_malloc(sizeof(*request_buf));
 	if (NULL == request_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to allocate memory for NS offload request"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -1046,7 +1046,7 @@ QDF_STATUS sme_set_ps_ns_offload(tHalHandle hal_ctx,
 	msg.bodyptr = request_buf;
 	if (QDF_STATUS_SUCCESS !=
 			cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Not able to post SIR_HAL_SET_HOST_OFFLOAD message to HAL"));
 		cdf_mem_free(request_buf);
 		return QDF_STATUS_E_FAILURE;
diff --git a/core/sme/src/common/sme_trace.c b/core/sme/src/common/sme_trace.c
index fd7d617e7513..074d0d4f3166 100644
--- a/core/sme/src/common/sme_trace.c
+++ b/core/sme/src/common/sme_trace.c
@@ -202,7 +202,7 @@ static uint8_t *sme_trace_get_command_string(uint32_t command)
 	}
 }
 
-static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
+static void sme_trace_dump(tpAniSirGlobal pMac, tp_qdf_trace_record pRecord,
 			   uint16_t recIndex)
 {
 	if (TRACE_CODE_SME_COMMAND == pRecord->code) {
@@ -219,6 +219,6 @@ static void sme_trace_dump(tpAniSirGlobal pMac, tp_cdf_trace_record pRecord,
 
 void sme_trace_init(tpAniSirGlobal pMac)
 {
-	cdf_trace_register(QDF_MODULE_ID_SME, (tp_cdf_trace_cb) &sme_trace_dump);
+	qdf_trace_register(QDF_MODULE_ID_SME, (tp_qdf_trace_cb) &sme_trace_dump);
 }
 #endif
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 62e38897eb20..8c2c4bbdf82f 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -475,7 +475,7 @@ static int8_t csr_find_channel_pwr(struct channel_power *
 	}
 	/* could not find the channel list in default list */
 	/* this should not have occured */
-	CDF_ASSERT(0);
+	QDF_ASSERT(0);
 	return 0;
 }
 
@@ -592,7 +592,7 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx,
 	chan_list_greedy = cdf_mem_malloc(buf_size);
 	chan_list_non_greedy = cdf_mem_malloc(buf_size);
 	if (!chan_list_greedy || !chan_list_non_greedy) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate memory for tSirUpdateChanList");
 		return;
 	}
@@ -646,11 +646,11 @@ void csr_roam_sort_channel_for_early_stop(tpAniSirGlobal mac_ctx,
 			}
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_DEBUG,
 		"greedy=%d, non-greedy=%d, tot=%d",
 		num_greedy_chan, num_non_greedy_chan, num_channel);
 	if ((num_greedy_chan + num_non_greedy_chan) != num_channel) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			"incorrect sorting of channels");
 		goto scan_list_sort_error;
 	}
@@ -698,7 +698,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 	csr_init_operating_classes((tHalHandle) pMac);
 	pChanList = (tSirUpdateChanList *) cdf_mem_malloc(bufLen);
 	if (!pChanList) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to allocate memory for tSirUpdateChanList");
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -730,7 +730,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 			else
 				pChanList->chanParam[num_channel].dfsSet =
 					true;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				"channel:%d, pwr=%d, DFS=%d\n",
 				pChanList->chanParam[num_channel].chanId,
 				pChanList->chanParam[num_channel].pwr,
@@ -757,7 +757,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 		csr_roam_sort_channel_for_early_stop(pMac, pChanList,
 						     num_channel);
 	else
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Early Stop Scan Feature not supported"));
 
 	msg.type = WMA_UPDATE_CHAN_LIST_REQ;
@@ -766,7 +766,7 @@ QDF_STATUS csr_update_channel_list(tpAniSirGlobal pMac)
 	pChanList->numChan = num_channel;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to post msg to WMA", __func__);
 		cdf_mem_free(pChanList);
 		return QDF_STATUS_E_FAILURE;
@@ -805,7 +805,7 @@ QDF_STATUS csr_start(tpAniSirGlobal pMac)
 			break;
 		}
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "Scan offload is enabled, update default chan list");
 		status = csr_update_channel_list(pMac);
 	} while (0);
@@ -1528,7 +1528,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 			}
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  "Invalid band, No operation carried out (Band %d)",
 			  eBand);
 		return QDF_STATUS_E_INVAL;
@@ -1560,7 +1560,7 @@ QDF_STATUS csr_create_roam_scan_channel_list(tpAniSirGlobal pMac,
 		currChannelListInfo->ChannelList
 			= cdf_mem_malloc(outNumChannels * sizeof(uint8_t));
 		if (NULL == currChannelListInfo->ChannelList) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 				  "Failed to allocate memory for roam scan channel list");
 			currChannelListInfo->numOfChannels = 0;
 			return QDF_STATUS_E_NOMEM;
@@ -1579,7 +1579,7 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
 	if (CSR_IS_PHY_MODE_A_ONLY(pMac) && (eBand == eCSR_BAND_24)) {
 		/* DOT11 mode configured to 11a only and received
 		   request to change the band to 2.4 GHz */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "failed to set band cfg80211 = %u, band = %u",
 			  pMac->roam.configParam.uCfgDot11Mode, eBand);
 		return QDF_STATUS_E_INVAL;
@@ -1588,12 +1588,12 @@ QDF_STATUS csr_set_band(tHalHandle hHal, uint8_t sessionId, eCsrBand eBand)
 	     CSR_IS_PHY_MODE_G_ONLY(pMac)) && (eBand == eCSR_BAND_5G)) {
 		/* DOT11 mode configured to 11b/11g only and received
 		   request to change the band to 5 GHz */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "failed to set band dot11mode = %u, band = %u",
 			  pMac->roam.configParam.uCfgDot11Mode, eBand);
 		return QDF_STATUS_E_INVAL;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "Band changed to %u (0 - ALL, 1 - 2.4 GHZ, 2 - 5GHZ)", eBand);
 	pMac->roam.configParam.eBand = eBand;
 	pMac->roam.configParam.bandCapability = eBand;
@@ -2462,8 +2462,8 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum)
 			if ((dfsChan->dfs_channel_number == chnNum)
 			    && (dfsChan->radar_status_flag ==
 				eSAP_DFS_CHANNEL_UNAVAILABLE)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("channel %d is in dfs nol"),
 					  chnNum);
 				status = QDF_STATUS_E_FAILURE;
@@ -2473,7 +2473,7 @@ QDF_STATUS csr_is_valid_channel(tpAniSirGlobal pMac, uint8_t chnNum)
 	}
 
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("channel %d is not available"), chnNum);
 	}
 
@@ -2824,7 +2824,7 @@ QDF_STATUS csr_roam_call_callback(tpAniSirGlobal pMac, uint32_t sessionId,
 
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
 		sms_log(pMac, LOGE, "Session ID:%d is not valid", sessionId);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	pSession = CSR_GET_SESSION(pMac, sessionId);
@@ -3040,7 +3040,7 @@ QDF_STATUS csr_roam_issue_disassociate(tpAniSirGlobal pMac, uint32_t sessionId,
 	} else if (eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT == NewSubstate) {
 		reasonCode = eSIR_MAC_DISASSOC_LEAVING_BSS_REASON;
 		NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_FORCED;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL
 				  ("set to reason code eSIR_MAC_DISASSOC_LEAVING_BSS_REASON"
 				  " and set back NewSubstate"));
@@ -3369,7 +3369,7 @@ QDF_STATUS csr_roam_prepare_bss_config(tpAniSirGlobal pMac,
 				       tDot11fBeaconIEs *pIes)
 {
 	eCsrCfgDot11Mode cfgDot11Mode;
-	CDF_ASSERT(pIes != NULL);
+	QDF_ASSERT(pIes != NULL);
 	if (pIes == NULL)
 		return QDF_STATUS_E_FAILURE;
 
@@ -3605,7 +3605,7 @@ static QDF_STATUS csr_roam_get_qos_info_from_bss(tpAniSirGlobal pMac,
 			csr_get_parsed_bss_description_ies(
 				pMac, pBssDesc, &pIes))) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "csr_roam_get_qos_info_from_bss() failed");
 			break;
 		}
@@ -3854,7 +3854,7 @@ static QDF_STATUS csr_get_rate_set(tpAniSirGlobal pMac,
 	uint16_t rateBitmap = 0;
 	cdf_mem_set(pOpRateSet, sizeof(tSirMacRateSet), 0);
 	cdf_mem_set(pExRateSet, sizeof(tSirMacRateSet), 0);
-	CDF_ASSERT(pIes != NULL);
+	QDF_ASSERT(pIes != NULL);
 
 	if (NULL == pIes) {
 		sms_log(pMac, LOGE, FL("failed to parse BssDesc"));
@@ -3927,7 +3927,7 @@ static void csr_set_cfg_rate_set(tpAniSirGlobal pMac, eCsrPhyMode phyMode,
 	uint32_t ExtendedOperationalRatesLength = 0;
 	uint8_t MCSRateIdxSet[SIZE_OF_SUPPORTED_MCS_SET];
 	uint32_t MCSRateLength = 0;
-	CDF_ASSERT(pIes != NULL);
+	QDF_ASSERT(pIes != NULL);
 	if (NULL != pIes) {
 		csr_is_phy_mode_match(pMac, phyMode, pBssDesc, pProfile,
 				      &cfgDot11Mode, pIes);
@@ -4155,7 +4155,7 @@ void csr_roam_ccm_cfg_set_callback(tpAniSirGlobal pMac, int32_t result)
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	pSession = &pMac->roam.roamSession[sessionId];
 	if (pSession->roam_synch_in_progress) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "LFR3:csr_roam_cfg_set_callback");
 	}
 #endif
@@ -5243,7 +5243,7 @@ void csr_roam_complete(tpAniSirGlobal pMac, eCsrRoamCompleteResult Result,
 	tListElem *pEntry;
 	tSmeCmd *pCommand;
 	bool fReleaseCommand = true;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: Roam Completion ...", __func__);
 	pEntry = csr_ll_peek_head(&pMac->sme.smeCmdActiveList, LL_ACCESS_LOCK);
 	if (pEntry) {
@@ -5654,14 +5654,14 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id)
 	tCsrRoamSession *session = &mac->roam.roamSession[session_id];
 
 	/* Clean up the roam synch in progress for LFR3 */
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "%s: Roam Synch Failed, Clean Up", __func__);
 	session->roam_synch_in_progress = false;
 
 	roam_offload_failed = cdf_mem_malloc(
 				sizeof(struct roam_offload_synch_fail));
 	if (NULL == roam_offload_failed) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: unable to allocate memory for roam synch fail" ,
 			  __func__);
 		return;
@@ -5673,7 +5673,7 @@ void csr_roam_synch_clean_up (tpAniSirGlobal mac, uint8_t session_id)
 	msg.bodyptr  = roam_offload_failed;
 	if (!QDF_IS_STATUS_SUCCESS(cds_mq_post_message(QDF_MODULE_ID_WMA,
 						       &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"%s: Unable to post WMA_ROAM_OFFLOAD_SYNCH_FAIL to WMA",
 			__func__);
 		cdf_mem_free(roam_offload_failed);
@@ -6259,8 +6259,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
 			if (session->roam_synch_in_progress
 				&& (roam_offload_params->authStatus
 				== CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_DEBUG,
 					FL("LFR3:Don't start waitforkey timer"));
 				csr_roam_substate_change(mac_ctx,
 					eCSR_ROAM_SUBSTATE_NONE, session_id);
@@ -6319,8 +6319,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
 		if (context) {
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 			if (session->roam_synch_in_progress)
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_DEBUG,
 					FL("LFR3:Clear Connected info"));
 #endif
 			csr_roam_free_connected_info(mac_ctx,
@@ -6472,8 +6472,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
 				cdf_mem_copy(roam_info.replay_ctr,
 					roam_offload_params->replay_ctr,
 					SIR_REPLAY_CTR_LEN);
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_DEBUG,
 					FL
 					("LFR3: Copy KCK, KEK and Replay Ctr"));
 			}
@@ -6504,8 +6504,8 @@ static void csr_roam_process_join_res(tpAniSirGlobal mac_ctx,
 	if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) {
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 		if (session->roam_synch_in_progress) {
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_DEBUG,
 				FL
 				("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up"));
 		}
@@ -6632,7 +6632,7 @@ static bool csr_roam_process_results(tpAniSirGlobal mac_ctx, tSmeCmd *cmd,
 		roam_info.staId = session->connectedInfo.staId;
 		roam_info.u.pConnectedProfile = &session->connectedProfile;
 		if (0 == roam_info.staId)
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 
 		session->bRefAssocStartCnt--;
 		csr_roam_call_callback(mac_ctx, session_id, &roam_info,
@@ -6988,7 +6988,7 @@ QDF_STATUS csr_roam_issue_connect(tpAniSirGlobal pMac, uint32_t sessionId,
 		/* We need to free the BssList when the command is done */
 		pCommand->u.roamCmd.fReleaseBssList = true;
 		pCommand->u.roamCmd.fUpdateCurRoamProfile = true;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("CSR PERSONA=%d"),
 			  pCommand->u.roamCmd.roamProfile.csrPersona);
 		status = csr_queue_sme_command(pMac, pCommand, fImediate);
@@ -7553,7 +7553,7 @@ QDF_STATUS csr_roam_process_disassoc_deauth(tpAniSirGlobal pMac, tSmeCmd *pComma
 		    && (eSIR_MAC_DISASSOC_LEAVING_BSS_REASON ==
 			pCommand->u.roamCmd.reason)) {
 			NewSubstate = eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL
 					  ("set to substate eCSR_ROAM_SUBSTATE_DISASSOC_STA_HAS_LEFT"));
 		}
@@ -7698,7 +7698,7 @@ QDF_STATUS csr_roam_issue_disassociate_cmd(tpAniSirGlobal pMac, uint32_t session
 			pCommand->u.roamCmd.roamReason = eCsrForcedDisassoc;
 			pCommand->u.roamCmd.reason =
 				eSIR_MAC_DISASSOC_LEAVING_BSS_REASON;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL
 					  ("SME convert to internal reason code eCsrStaHasLeft"));
 			break;
@@ -7811,7 +7811,7 @@ QDF_STATUS csr_roam_save_connected_infomation(tpAniSirGlobal pMac,
 
 	pSession = CSR_GET_SESSION(pMac, sessionId);
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("session %d not found"), sessionId);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -7977,12 +7977,12 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac,
 	if (pSmeJoinRsp) {
 		session_ptr = CSR_GET_SESSION(pMac, pSmeJoinRsp->sessionId);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Sme Join Response is NULL"));
 		return;
 	}
 	if (!session_ptr) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("session %d not found"), pSmeJoinRsp->sessionId);
 		return;
 	}
@@ -8055,13 +8055,13 @@ static void csr_roam_join_rsp_processor(tpAniSirGlobal pMac,
 			 * ***************************************************/
 			if (session_ptr->join_bssid_count >=
 					CSR_MAX_BSSID_COUNT)
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("Excessive Join Req Failures"));
 
 			if (is_dis_pending)
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_ERROR,
 					FL("disconnect is pending, complete roam"));
 
 			session_ptr->join_bssid_count = 0;
@@ -8097,7 +8097,7 @@ static QDF_STATUS csr_roam_issue_reassociate(tpAniSirGlobal pMac,
 	csr_roam_state_change(pMac, eCSR_ROAMING_STATE_JOINING, sessionId);
 	/* Set the roaming substate to 'join attempt'... */
 	csr_roam_substate_change(pMac, eCSR_ROAM_SUBSTATE_REASSOC_REQ, sessionId);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  FL(" calling csr_send_join_req_msg (eWNI_SME_REASSOC_REQ)"));
 	/* attempt to Join this BSS... */
 	return csr_send_join_req_msg(pMac, sessionId, pSirBssDesc, pProfile, pIes,
@@ -8436,7 +8436,7 @@ csr_roaming_state_config_cnf_processor(tpAniSirGlobal mac_ctx,
 
 	if (NULL == scan_result) {
 		/* If we are roaming TO an Infrastructure BSS... */
-		CDF_ASSERT(scan_result != NULL);
+		QDF_ASSERT(scan_result != NULL);
 		return;
 	}
 
@@ -8539,7 +8539,7 @@ static void csr_roam_roaming_state_reassoc_rsp_processor(tpAniSirGlobal pMac,
 	uint32_t roamId = 0;
 
 	if (eSIR_SME_SUCCESS == pSmeJoinRsp->statusCode) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL("CSR SmeReassocReq Successful"));
 		result = eCsrReassocSuccess;
 		/*
@@ -8786,7 +8786,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac,
 
 	csr_ser_des_unpack_diassoc_rsp((uint8_t *) pSmeRsp, &SmeDisassocRsp);
 	sessionId = SmeDisassocRsp.sessionId;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"),
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, FL("sessionId %d"),
 		  sessionId);
 
 	if (csr_is_conn_state_infra(pMac, sessionId)) {
@@ -8815,7 +8815,7 @@ void csr_roam_roaming_state_disassoc_rsp_processor(tpAniSirGlobal pMac,
 		}
 		csr_roam_complete(pMac, eCsrNothingToJoin, NULL);
 	} else if (CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL("CSR SmeDisassocReq due to HO on session %d"),
 			  sessionId);
 		pNeighborRoamInfo = &pMac->roam.neighborRoamInfo[sessionId];
@@ -9014,7 +9014,7 @@ void csr_roaming_state_msg_processor(tpAniSirGlobal pMac, void *pMsgBuf)
 							pSmeRsp->sessionId)
 		    || CSR_IS_ROAM_SUBSTATE_DISASSOC_HO(pMac,
 							pSmeRsp->sessionId)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  FL("eWNI_SME_DISASSOC_RSP subState = %s"),
 				  mac_trace_getcsr_roam_sub_state(
 				  pMac->roam.curSubState[pSmeRsp->sessionId]));
@@ -9378,7 +9378,7 @@ static QDF_STATUS csr_roam_issue_set_key_command(tpAniSirGlobal pMac,
 #if defined(FEATURE_WLAN_ESE) || defined (FEATURE_WLAN_WAPI)
 	tCsrRoamSession *pSession = CSR_GET_SESSION(pMac, sessionId);
 	if (NULL == pSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("session %d not found"), sessionId);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -9597,7 +9597,7 @@ csr_roam_prepare_filter_from_profile(tpAniSirGlobal mac_ctx,
 
 	if (profile->SSIDs.numOfSSIDs) {
 		scan_fltr->SSIDs.numOfSSIDs = profile->SSIDs.numOfSSIDs;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("No of Allowed List:%d"),
 			roam_params->num_ssid_allowed_list);
 		if (scan_fltr->scan_filter_for_roam
@@ -9778,14 +9778,14 @@ static QDF_STATUS csr_send_snr_request(void *pGetRssiReq)
 
 	wma_handle = cds_get_context(QDF_MODULE_ID_WMA);
 	if (!wma_handle) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"wma_handle is NULL");
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (QDF_STATUS_SUCCESS !=
 		wma_send_snr_request(wma_handle, pGetRssiReq)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"Failed to Trigger wma stats request");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -10955,7 +10955,7 @@ void csr_call_roaming_completion_callback(tpAniSirGlobal pMac,
 			pSession->bRefAssocStartCnt--;
 
 			if (0 != pSession->bRefAssocStartCnt) {
-				CDF_ASSERT(pSession->bRefAssocStartCnt == 0);
+				QDF_ASSERT(pSession->bRefAssocStartCnt == 0);
 				return;
 			}
 			/* Need to call association_completion because there is an assoc_start pending. */
@@ -11249,7 +11249,7 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId,
 	if (pCommand) {
 		roamId = pCommand->u.roamCmd.roamId;
 		if (sessionId != pCommand->sessionId) {
-			CDF_ASSERT(sessionId == pCommand->sessionId);
+			QDF_ASSERT(sessionId == pCommand->sessionId);
 			return;
 		}
 	}
@@ -11258,7 +11258,7 @@ void csr_roam_completion(tpAniSirGlobal pMac, uint32_t sessionId,
 		csr_roam_complete_roaming(pMac, sessionId, fSuccess, roamResult);
 	} else {
 		if (pSession->bRefAssocStartCnt != 0) {
-			CDF_ASSERT(pSession->bRefAssocStartCnt == 0);
+			QDF_ASSERT(pSession->bRefAssocStartCnt == 0);
 			return;
 		}
 		sms_log(pMac, LOGW,
@@ -11859,7 +11859,7 @@ int8_t csr_get_cfg_max_tx_power(tpAniSirGlobal pMac, uint8_t channel)
 	else
 		status = QDF_STATUS_SUCCESS;
 	if (status != QDF_STATUS_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("%s: failed to allocate memory, status = %d"),
 			  __FUNCTION__, status);
 		goto error;
@@ -12356,10 +12356,10 @@ csr_roam_get_bss_start_parms(tpAniSirGlobal pMac,
 	    || (pProfile->csrPersona == QDF_P2P_GO_MODE))
 	    && (pParam->uCfgDot11Mode == eCSR_CFG_DOT11_MODE_11B)) {
 		/* This should never happen */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  FL("For P2P (persona %d) dot11_mode is 11B"),
 			  pProfile->csrPersona);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 
 	nw_type = csr_convert_mode_to_nw_type(pParam->uCfgDot11Mode, band);
@@ -13243,7 +13243,7 @@ static QDF_STATUS csr_roam_start_wds(tpAniSirGlobal pMac, uint32_t sessionId,
 		/* send stop_bss to PE, before we can continue. */
 
 		if (csr_is_conn_state_wds(pMac, sessionId)) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 		cdf_mem_set(&bssConfig, sizeof(tBssConfigParam), 0);
@@ -13446,7 +13446,7 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 #endif
 		csr_join_req->staPersona = (uint8_t) pProfile->csrPersona;
 		csr_join_req->cbMode = (uint8_t) pSession->bssParams.cbMode;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("CSR PERSONA=%d CSR CbMode %d"),
 			  pProfile->csrPersona, pSession->bssParams.cbMode);
 		csr_join_req->uapsdPerAcBitmask = pProfile->uapsd_mask;
@@ -13926,8 +13926,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 			      roam.configParam.is_sta_connection_in_5gz_enabled)
 			     && CDS_IS_CHANNEL_5GHZ(pBssDescription->
 							channelId)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("STA-conn on 5G isn't allowed"));
 				status = QDF_STATUS_E_FAILURE;
 				break;
@@ -13969,8 +13969,8 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 			if (eWNI_SME_JOIN_REQ == messageType) {
 				/* Notify QoS module that join happening */
 				pSession->join_bssid_count++;
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_DEBUG,
 						"BSSID Count = %d",
 						pSession->join_bssid_count);
 				sme_qos_csr_event_ind(pMac, (uint8_t) sessionId,
@@ -14847,8 +14847,8 @@ QDF_STATUS csr_roam_open_session(tpAniSirGlobal pMac,
 			/* get the HT capability info */
 			if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &value)
 					!= eSIR_SUCCESS) {
-				CDF_TRACE(QDF_MODULE_ID_QDF,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_QDF,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: could not get HT capability info",
 					  __func__);
 				break;
@@ -15366,7 +15366,7 @@ void csr_roam_stats_client_timer_handler(void *pv)
 	tCsrStatsClientReqInfo *pStaEntry = (tCsrStatsClientReqInfo *) pv;
 	if (QDF_TIMER_STATE_STOPPED ==
 	    qdf_mc_timer_get_current_state(&pStaEntry->timer)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("roam stats client timer is stopped"));
 	}
 }
@@ -15450,7 +15450,7 @@ csr_update_stats(tpAniSirGlobal mac, uint8_t stats_type,
 		} else {
 			sms_log(mac, LOGE, FL("out bound staId:%d. failed to copy PerSta stats"),
 				sme_stats_rsp->staId);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 		*stats += sizeof(tCsrPerStaStatsInfo);
 		*length -= sizeof(tCsrPerStaStatsInfo);
@@ -15660,7 +15660,7 @@ void csr_roam_vcc_trigger(tpAniSirGlobal pMac)
 	ul_mac_loss_trigger_threshold =
 		pMac->roam.configParam.vccUlMacLossThreshold;
 	if (0 == ul_mac_loss_trigger_threshold) {
-		CDF_ASSERT(ul_mac_loss_trigger_threshold != 0);
+		QDF_ASSERT(ul_mac_loss_trigger_threshold != 0);
 		return;
 	}
 	sms_log(pMac, LOGW, "csr_roam_vcc_trigger: UL_MAC_LOSS_THRESHOLD is %d",
@@ -16221,13 +16221,13 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac,
 
 	nStatus = dot11f_get_packed_probe_request_size(pMac, &pr, &nPayload);
 	if (DOT11F_FAILED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to calculate the packed size f"
 			  "or a Probe Request (0x%08x).\n", nStatus);
 
 		nPayload = sizeof(tDot11fProbeRequest);
 	} else if (DOT11F_WARNED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "There were warnings while calculating"
 			  "the packed size for a Probe Request ("
 			  "0x%08x).\n", nStatus);
@@ -16245,7 +16245,7 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac,
 							  selfMacAddr);
 
 	if (eSIR_SUCCESS != nSirStatus) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to populate the buffer descriptor for a Probe Request (%d).\n",
 			  nSirStatus);
 		return nSirStatus;
@@ -16255,12 +16255,12 @@ csr_roam_scan_offload_prepare_probe_req_template(tpAniSirGlobal pMac,
 					    sizeof(tSirMacMgmtHdr),
 					    nPayload, &nPayload);
 	if (DOT11F_FAILED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to pack a Probe Request (0x%08x).\n",
 			  nStatus);
 		return eSIR_FAILURE;
 	} else if (DOT11F_WARNED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "There were warnings while packing a Probe Request (0x%08x).\n",
 			  nStatus);
 	}
@@ -16300,7 +16300,7 @@ csr_update_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 	cdf_mem_copy(req_buf->PSK_PMK, session->psk_pmk,
 		     sizeof(req_buf->PSK_PMK));
 	req_buf->pmk_len = session->pmk_len;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "LFR3: PMK Length = %d", req_buf->pmk_len);
 	req_buf->R0KH_ID_Length = session->ftSmeContext.r0kh_id_len;
 	cdf_mem_copy(req_buf->R0KH_ID,
@@ -16384,7 +16384,7 @@ csr_fetch_ch_lst_from_ini(tpAniSirGlobal mac_ctx,
 	band = mac_ctx->roam.configParam.bandCapability;
 	if ((eCSR_BAND_24 != band) && (eCSR_BAND_5G != band)
 	    && (eCSR_BAND_ALL != band)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Invalid band(%d), roam scan offload req aborted"),
 			  band);
 		return QDF_STATUS_E_FAILURE;
@@ -16432,7 +16432,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx,
 	uint8_t num_channels = 0;
 	uint8_t *ch_lst =
 		mac_ctx->scan.occupiedChannels[session_id].channelList;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		"Num of channels before filtering=%d",
 		mac_ctx->scan.occupiedChannels[session_id].numChannels);
 	for (i = 0; i < mac_ctx->scan.occupiedChannels[session_id].numChannels;
@@ -16445,7 +16445,7 @@ csr_fetch_ch_lst_from_occupied_lst(tpAniSirGlobal mac_ctx,
 				*ch_lst;
 		}
 		if (*ch_lst)
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				"DFSRoam=%d, ChnlState=%d, Chnl=%d, num_ch=%d",
 				mac_ctx->roam.configParam.allowDFSChannelRoam,
 				cds_get_channel_state(*ch_lst), *ch_lst,
@@ -16533,7 +16533,7 @@ csr_fetch_valid_ch_lst(tpAniSirGlobal mac_ctx,
 					    mac_ctx->roam.validChannelList,
 					    &host_channels);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to get the valid channel list"));
 		return status;
 	}
@@ -16592,7 +16592,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 
 	req_buf = cdf_mem_malloc(sizeof(tSirRoamOffloadScanReq));
 	if (NULL == req_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Mem alloc for roam scan offload req failed."));
 		return NULL;
 	}
@@ -16672,7 +16672,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 			eCSR_AUTH_TYPE_OPEN_SYSTEM)  ||
 		(csr_is_auth_type_ese(req_buf->
 			ConnectedNetwork.authentication)));
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR3:IsEseAssoc=%d\n"), req_buf->IsESEAssoc);
 #endif
 	if (ese_neighbor_list_recvd || curr_ch_lst_info->numOfChannels == 0) {
@@ -16712,7 +16712,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 		} else
 			break;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("ChnlCacheType:%d, No of Chnls:%d,Channels: %s"),
 		  req_buf->ChannelCacheType,
 		  req_buf->ConnectedNetwork.ChannelCount, ch_cache_str);
@@ -16741,14 +16741,14 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 	 */
 	if (req_buf->HomeAwayTime < (req_buf->NeighborScanChannelMaxTime +
 	     (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  FL("Invalid config, Home away time(%d) is less than (twice RF switching time + channel max time)(%d). Hence enforcing home away time to disable (0)"),
 			  req_buf->HomeAwayTime,
 			  (req_buf->NeighborScanChannelMaxTime +
 			   (2 * CSR_ROAM_SCAN_CHANNEL_SWITCH_TIME)));
 		req_buf->HomeAwayTime = 0;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("HomeAwayTime:%d"), req_buf->HomeAwayTime);
 
 	/*Prepare a probe request for 2.4GHz band and one for 5GHz band */
@@ -16773,7 +16773,7 @@ csr_create_roam_scan_offload_request(tpAniSirGlobal mac_ctx,
 		mac_ctx->roam.configParam.early_stop_scan_min_threshold;
 	req_buf->early_stop_scan_max_threshold =
 		mac_ctx->roam.configParam.early_stop_scan_max_threshold;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("EarlyStopFeature Enable=%d, MinThresh=%d, MaxThresh=%d"),
 		  req_buf->early_stop_scan_enable,
 		  req_buf->early_stop_scan_min_threshold,
@@ -16812,7 +16812,7 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer,
 			cdf_mem_compare(roam_params->ssid_allowed_list[i].ssId,
 				req_buffer->ConnectedNetwork.ssId.ssId,
 				roam_params->ssid_allowed_list[i].length)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				"Whitelist contains connected profile SSID");
 			match = true;
 			break;
@@ -16821,11 +16821,11 @@ static void check_allowed_ssid_list(tSirRoamOffloadScanReq *req_buffer,
 	if (!match) {
 		if (roam_params->num_ssid_allowed_list >=
 				MAX_SSID_ALLOWED_LIST) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				"Whitelist is FULL. Cannot Add another entry");
 			return;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				"Adding Connected profile SSID to whitelist");
 		/* i is the next available index to add the entry.*/
 		i = roam_params->num_ssid_allowed_list;
@@ -16893,7 +16893,7 @@ bool csr_is_RSO_cmd_allowed(tpAniSirGlobal mac_ctx, uint8_t command,
 		desiredMask = RSO_ABORT_SCAN_ALLOW_MASK;
 		break;
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Wrong RSO command %d, not allowed"), command);
 		return 0;/*Cmd Not allowed*/
 	}
@@ -16930,7 +16930,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	uint8_t op_channel;
 
 	if (NULL == session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("session is null"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -16952,7 +16952,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	}
 	if (!csr_is_RSO_cmd_allowed(mac_ctx, command, session_id) &&
 			reason != REASON_ROAM_SET_BLACKLIST_BSSID) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("RSO out-of-sync command %d lastSentCmd %d"),
 			command, roam_info->last_sent_cmd);
 		return QDF_STATUS_E_FAILURE;
@@ -16979,7 +16979,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	    (reason != REASON_ROAM_SET_BLACKLIST_BSSID)) {
 		state = mac_trace_get_neighbour_roam_state(
 				roam_info->neighborRoamState);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL("Scan Command not sent to FW state=%s and cmd=%d"),
 			  state,  command);
 		return QDF_STATUS_E_FAILURE;
@@ -16989,7 +16989,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 						       session_id, reason,
 						       session, roam_info);
 	if (!req_buf) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to create req packet"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -17016,7 +17016,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	 */
 	if (roam_params_src->rssi_diff)
 		req_buf->RoamRssiDiff = roam_params_src->rssi_diff;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		"num_bssid_avoid_list: %d, num_ssid_allowed_list: %d, "
 		"num_bssid_favored: %d, raise_rssi_thresh_5g: %d, "
 		"drop_rssi_thresh_5g: %d, raise_rssi_type_5g: %d, "
@@ -17037,18 +17037,18 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 		req_buf->RoamRssiDiff, roam_params_dst->alert_rssi_threshold);
 
 	for (i = 0; i < roam_params_dst->num_bssid_avoid_list; i++) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Blacklist Bssid: ("MAC_ADDRESS_STR")",
 			MAC_ADDR_ARRAY(roam_params_dst->bssid_avoid_list[i].bytes));
 	}
 	for (i = 0; i < roam_params_dst->num_ssid_allowed_list; i++) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Whitelist: %.*s",
 			roam_params_dst->ssid_allowed_list[i].length,
 			roam_params_dst->ssid_allowed_list[i].ssId);
 	}
 	for (i = 0; i < roam_params_dst->num_bssid_favored; i++) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Preferred Bssid: ("MAC_ADDRESS_STR") score: %d",
 			MAC_ADDR_ARRAY(roam_params_dst->bssid_favored[i].bytes),
 			roam_params_dst->bssid_favored_factor[i]);
@@ -17068,14 +17068,14 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	 * to connect to a better 5GHz AP is available.
 	 */
 	if (CDS_IS_CHANNEL_5GHZ(op_channel)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"Disabling HI_RSSI feature as connected AP is 5GHz");
 		req_buf->hi_rssi_scan_rssi_delta = 0;
 	} else {
 		req_buf->hi_rssi_scan_rssi_delta =
 			roam_info->cfgParams.hi_rssi_scan_rssi_delta;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		"hi_rssi:delta=%d, max_count=%d, delay=%d, ub=%d",
 			req_buf->hi_rssi_scan_rssi_delta,
 			req_buf->hi_rssi_scan_max_count,
@@ -17087,7 +17087,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	msg.bodyptr = req_buf;
 	if (!QDF_IS_STATUS_SUCCESS
 		    (cds_mq_post_message(QDF_MODULE_ID_WMA, &msg))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Not able to post message to WMA",
 			  __func__);
 		cdf_mem_free(req_buf);
@@ -17101,7 +17101,7 @@ csr_roam_offload_scan(tpAniSirGlobal mac_ctx, uint8_t session_id,
 	/* update the last sent cmd */
 	roam_info->last_sent_cmd = command;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "Roam Scan Offload Command %d, Reason %d", command, reason);
 	return status;
 }
@@ -17111,7 +17111,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac,
 {
 	switch (scanOffloadRsp->reason) {
 	case 0:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  "Rsp for Roam Scan Offload with failure status");
 		break;
 	case REASON_OS_REQUESTED_ROAMING_NOW:
@@ -17120,7 +17120,7 @@ QDF_STATUS csr_roam_offload_scan_rsp_hdlr(tpAniSirGlobal pMac,
 		break;
 
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "Rsp for Roam Scan Offload with reason %d",
 			  scanOffloadRsp->reason);
 	}
@@ -17505,7 +17505,7 @@ void csr_release_command(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 		sme_release_command(pMac, pCommand);
 	} else {
 		sms_log(pMac, LOGE, FL("no pending commands"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 }
 
@@ -17517,7 +17517,7 @@ QDF_STATUS csr_queue_sme_command(tpAniSirGlobal pMac, tSmeCmd *pCommand,
 
 	if (!SME_IS_START(pMac)) {
 		sms_log(pMac, LOGE, FL("Sme in stop state"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_PERM;
 	}
 
@@ -18305,13 +18305,13 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf)
 	if (pSmeHOFailInd)
 		sessionId = pSmeHOFailInd->sessionId;
 	else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "LFR3: Hand-Off Failure Ind is NULL");
 		return;
 	}
 	/* Roaming is supported only on Infra STA Mode. */
 	if (!csr_roam_is_sta_mode(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "LFR3:HO Fail cannot be handled for session %d",
 			  sessionId);
 		return;
@@ -18319,7 +18319,7 @@ void csr_process_ho_fail_ind(tpAniSirGlobal pMac, void *pMsgBuf)
 	csr_roam_synch_clean_up(pMac, sessionId);
 	csr_roaming_report_diag_event(pMac, NULL,
 			eCSR_REASON_ROAM_HO_FAIL);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		  "LFR3:Issue Disconnect on session %d", sessionId);
 	csr_roam_disconnect(pMac, sessionId, eCSR_DISCONNECT_REASON_UNSPECIFIED);
 }
@@ -18475,7 +18475,7 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl)
 	tCsrRoamSession *sap_session;
 
 	if (0 == chnl) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("channel is zero, connection not allowed"));
 
 		return false;
@@ -18487,7 +18487,7 @@ static bool csr_is_conn_allow_2g_band(tpAniSirGlobal mac_ctx, uint32_t chnl)
 		if ((0 != sap_session->bssParams.operationChn) &&
 				(sap_session->bssParams.operationChn != chnl)) {
 
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL
 				("Can't allow STA to connect, chnls not same"));
 			return false;
@@ -18515,7 +18515,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl)
 	tCsrRoamSession *p2pgo_session;
 
 	if (0 == chnl) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL
 				("channel is zero, connection not allowed"));
 		return false;
@@ -18530,7 +18530,7 @@ static bool csr_is_conn_allow_5g_band(tpAniSirGlobal mac_ctx, uint32_t chnl)
 				(p2pgo_session->bssParams.operationChn !=
 				 chnl)) {
 
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL
 				("Can't allow STA to connect, chnls not same"));
 			return false;
@@ -18570,7 +18570,7 @@ bool csr_clear_joinreq_param(tpAniSirGlobal mac_ctx,
 	if (NULL != bss_list) {
 		csr_scan_result_purge(mac_ctx,
 			sta_session->stored_roam_profile.bsslist_handle);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("bss list is released for session %d"), session_id);
 		sta_session->stored_roam_profile.bsslist_handle = NULL;
 	}
@@ -18659,7 +18659,7 @@ QDF_STATUS csr_issue_stored_joinreq(tpAniSirGlobal mac_ctx,
 			sta_session->stored_roam_profile.imediate_flag,
 			sta_session->stored_roam_profile.clear_flag);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL
 			("CSR failed issuing connect cmd with status = 0x%08X"),
 				status);
@@ -18982,7 +18982,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 	session->connectState = eCSR_ASSOC_STATE_TYPE_INFRA_ASSOCIATED;
 	roam_info = cdf_mem_malloc(sizeof(tCsrRoamInfo));
 	if (NULL == roam_info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR3: Mem Alloc failed for roam info"));
 		session->roam_synch_in_progress = false;
 		sme_release_global_lock(&mac_ctx->sme);
@@ -19030,8 +19030,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 	}
 	if ((roam_synch_data->authStatus
 				== CSR_ROAM_AUTH_STATUS_AUTHENTICATED)) {
-		CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_DEBUG,
 				FL("LFR3:Don't start waitforkey timer"));
 		csr_roam_substate_change(mac_ctx,
 				eCSR_ROAM_SUBSTATE_NONE, session_id);
@@ -19081,8 +19081,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 			SIR_MAC_HDR_LEN_3A,
 			roam_info->nAssocRspLength);
 
-	CDF_TRACE(QDF_MODULE_ID_SME,
-			CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME,
+			QDF_TRACE_LEVEL_DEBUG,
 			FL("LFR3:Clear Connected info"));
 	csr_roam_free_connected_info(mac_ctx,
 			&session->connectedInfo);
@@ -19153,7 +19153,7 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 	cdf_mem_copy(roam_info->kek, roam_synch_data->kek, SIR_KEK_KEY_LEN);
 	cdf_mem_copy(roam_info->replay_ctr, roam_synch_data->replay_ctr,
 			SIR_REPLAY_CTR_LEN);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		FL("LFR3: Copy KCK, KEK and Replay Ctr"));
 	roam_info->subnet_change_status =
 		CSR_GET_SUBNET_STATUS(roam_synch_data->roamReason);
@@ -19164,8 +19164,8 @@ void csr_roam_synch_callback(tpAniSirGlobal mac_ctx,
 	csr_reset_bkid_candidate_list(mac_ctx, session_id);
 #endif
 	if (!CSR_IS_WAIT_FOR_KEY(mac_ctx, session_id)) {
-		CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_DEBUG,
 				FL
 				("NO CSR_IS_WAIT_FOR_KEY -> csr_roam_link_up"));
 		csr_roam_link_up(mac_ctx, conn_profile->bssid);
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index b52a17ce1530..c587ca589e13 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -303,7 +303,7 @@ csr_scan_2g_only_request(tpAniSirGlobal mac_ctx,
 {
 	uint8_t idx, lst_sz = 0;
 
-	CDF_ASSERT(scan_cmd && scan_req);
+	QDF_ASSERT(scan_cmd && scan_req);
 	/* To silence the KW tool null check is added */
 	if ((scan_cmd == NULL) || (scan_req == NULL)) {
 		sms_log(mac_ctx, LOGE,
@@ -388,7 +388,7 @@ csr_issue_11d_scan(tpAniSirGlobal mac_ctx, tSmeCmd *scan_cmd,
 	if (csr_session == NULL) {
 		sms_log(mac_ctx, LOGE, FL("session %d not found"),
 			session_id);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -492,7 +492,7 @@ QDF_STATUS csr_scan_request(tpAniSirGlobal pMac, uint16_t sessionId,
 
 	if (scan_req == NULL) {
 		sms_log(pMac, LOGE, FL("scan_req is NULL"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 
@@ -1739,7 +1739,7 @@ csr_prefer_5ghz(tpAniSirGlobal pMac, tCsrScanResultFilter *pFilter)
 	pMac->scan.inScanResultBestAPRssi = -128;
 	roam_params = &pMac->roam.configParam.roam_params;
 #ifdef WLAN_DEBUG_ROAM_OFFLOAD
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("nSelect5GHzMargin"));
 #endif
 	csr_ll_lock(&pMac->scan.scanResultList);
@@ -1809,7 +1809,7 @@ csr_save_ies(tpAniSirGlobal pMac,
 	*fMatch = csr_match_bss(pMac, &pBssDesc->Result.BssDescriptor,
 			       pFilter, auth, uc, mc, &pIes);
 #ifdef WLAN_DEBUG_ROAM_OFFLOAD
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("csr_match_bss fmatch %d"), *fMatch);
 #endif
 	if (NULL == pIes)
@@ -2006,7 +2006,7 @@ csr_parse_scan_results(tpAniSirGlobal pMac,
 	}
 
 	if (QDF_STATUS_E_FAILURE == status)
-		sms_log(pMac, CDF_TRACE_LEVEL_ERROR,
+		sms_log(pMac, QDF_TRACE_LEVEL_ERROR,
 			FL("Retrieving pcl failed from HDD"));
 	pEntry = csr_ll_peek_head(&pMac->scan.scanResultList, LL_ACCESS_NOLOCK);
 	while (pEntry) {
@@ -2949,7 +2949,7 @@ static tCsrScanResult *csr_scan_save_bss_description(tpAniSirGlobal pMac,
 			     pBSSDescription, cbBSSDesc);
 #if defined(CDF_ENSBALED)
 		if (NULL != pCsrBssDescription->Result.pvIes) {
-			CDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL);
+			QDF_ASSERT(pCsrBssDescription->Result.pvIes == NULL);
 			return NULL;
 		}
 #endif
@@ -3322,7 +3322,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac)
 		 * pick random.we can put some more intelligence - TBD
 		 */
 		if (maxVotes < pMac->scan.votes11d[i].votes) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  " Votes for Country %c%c : %d\n",
 				  pMac->scan.votes11d[i].countryCode[0],
 				  pMac->scan.votes11d[i].countryCode[1],
@@ -3341,7 +3341,7 @@ bool csr_elected_country_info(tpAniSirGlobal pMac)
 		cdf_mem_copy(pMac->scan.countryCode11d,
 		       pMac->scan.votes11d[j].countryCode,
 		       WNI_CFG_COUNTRY_CODE_LEN);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "Selected Country is %c%c With count %d\n",
 			  pMac->scan.votes11d[j].countryCode[0],
 			  pMac->scan.votes11d[j].countryCode[1],
@@ -6300,15 +6300,15 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList,
 	uint32_t dataLen = sizeof(uint8_t) * NumChannels;
 	QDF_STATUS status;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: dump valid channel list(NumChannels(%d))",
 		  __func__, NumChannels);
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			   pChannelList, NumChannels);
 	cfg_set_str(pMac, WNI_CFG_VALID_CHANNEL_LIST, pChannelList,
 			dataLen);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "Scan offload is enabled, update default chan list");
 	/*
 	 * disable fcc constraint since new country code
@@ -6317,7 +6317,7 @@ void csr_set_cfg_valid_channel_list(tpAniSirGlobal pMac, uint8_t *pChannelList,
 	pMac->scan.fcc_constraint = false;
 	status = csr_update_channel_list(pMac);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "failed to update the supported channel list");
 	}
 	return;
@@ -6507,10 +6507,10 @@ void csr_set_cfg_scan_control_list(tpAniSirGlobal pMac, uint8_t *countryCode,
 				}
 
 			}
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "%s: dump scan control list", __func__);
-			CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME,
-					   CDF_TRACE_LEVEL_INFO, pControlList,
+			QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_SME,
+					   QDF_TRACE_LEVEL_INFO, pControlList,
 					   len);
 
 			cfg_set_str(pMac, WNI_CFG_SCAN_CONTROL_LIST,
@@ -7118,7 +7118,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac,
 		(SIR_MAC_HDR_LEN_3A + SIR_MAC_B_PR_SSID_OFFSET);
 	scan_res_ptr = cdf_mem_malloc(sizeof(tCsrScanResult) + length);
 	if (scan_res_ptr == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				" fail to allocate memory for frame");
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -7133,7 +7133,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac,
 						pMac, &scan_res_ptr->Result.
 						BssDescriptor,
 						&ies_local_ptr)))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s:Cannot Parse IEs", __func__);
 		csr_free_scan_result_entry(pMac, scan_res_ptr);
 		return QDF_STATUS_E_RESOURCES;
@@ -7143,7 +7143,7 @@ QDF_STATUS csr_scan_save_roam_offload_ap_to_scan_cache(tpAniSirGlobal pMac,
 			&scan_res_ptr->Result.BssDescriptor,
 			ies_local_ptr, &tmpSsid, &timer, true);
 	if (CSR_SCAN_IS_OVER_BSS_LIMIT(pMac)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"%s:BSS Limit Exceed", __func__);
 		if ((scan_res_ptr->Result.pvIes == NULL) && ies_local_ptr)
 			cdf_mem_free(ies_local_ptr);
@@ -7174,12 +7174,12 @@ csr_get_bssdescr_from_scan_handle(tScanResultHandle result_handle,
 	tScanResultList *bss_list = (tScanResultList *)result_handle;
 
 	if (NULL == bss_list) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("Empty bss_list"));
 		return NULL;
 	}
 	if (csr_ll_is_list_empty(&bss_list->List, LL_ACCESS_NOLOCK)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("bss_list->List is empty"));
 		cdf_mem_free(bss_list);
 		return NULL;
@@ -7215,12 +7215,12 @@ void csr_scan_active_list_timeout_handle(void *userData)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (scan_cmd == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Scan Timeout: Scan command is NULL"));
 		return;
 	}
 	if (hal_ctx == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("HAL Context is NULL"));
 		return;
 	}
diff --git a/core/sme/src/csr/csr_cmd_process.c b/core/sme/src/csr/csr_cmd_process.c
index 0eb96e2d1ea9..436593606097 100644
--- a/core/sme/src/csr/csr_cmd_process.c
+++ b/core/sme/src/csr/csr_cmd_process.c
@@ -173,7 +173,7 @@ bool csr_check_ps_ready(void *pv)
 	tpAniSirGlobal pMac = PMAC_STRUCT(pv);
 
 	if (pMac->roam.sPendingCommands < 0) {
-		CDF_ASSERT(pMac->roam.sPendingCommands >= 0);
+		QDF_ASSERT(pMac->roam.sPendingCommands >= 0);
 		return 0;
 	}
 	return pMac->roam.sPendingCommands == 0;
@@ -183,7 +183,7 @@ bool csr_check_ps_offload_ready(void *pv, uint32_t sessionId)
 {
 	tpAniSirGlobal pMac = PMAC_STRUCT(pv);
 
-	CDF_ASSERT(pMac->roam.sPendingCommands >= 0);
+	QDF_ASSERT(pMac->roam.sPendingCommands >= 0);
 	return pMac->roam.sPendingCommands == 0;
 }
 
diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c
index 20b02f8685ab..4241ee51ef44 100644
--- a/core/sme/src/csr/csr_link_list.c
+++ b/core/sme/src/csr/csr_link_list.c
@@ -35,7 +35,7 @@
 #include "csr_link_list.h"
 #include "qdf_lock.h"
 #include "cdf_memory.h"
-#include "cdf_trace.h"
+#include "qdf_trace.h"
 #include "qdf_mc_timer.h"
 
 static inline void csr_list_init(tListElem *pList)
@@ -107,7 +107,7 @@ void csr_list_insert_entry(tListElem *pEntry, tListElem *pNewEntry)
 {
 	tListElem *pLast;
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pEntry is Null", __func__);
 		return;
 	}
@@ -124,7 +124,7 @@ uint32_t csr_ll_count(tDblLinkList *pList)
 	uint32_t c = 0;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return c;
 	}
@@ -140,7 +140,7 @@ void csr_ll_lock(tDblLinkList *pList)
 {
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -154,7 +154,7 @@ void csr_ll_unlock(tDblLinkList *pList)
 {
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -169,7 +169,7 @@ bool csr_ll_is_list_empty(tDblLinkList *pList, bool fInterlocked)
 	bool fEmpty = true;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return fEmpty;
 	}
@@ -194,7 +194,7 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind)
 	tListElem *pEntry;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return fFound;
 	}
@@ -223,7 +223,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList)
 	QDF_STATUS qdf_status;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -247,7 +247,7 @@ QDF_STATUS csr_ll_open(tHddHandle hHdd, tDblLinkList *pList)
 void csr_ll_close(tDblLinkList *pList)
 {
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -264,7 +264,7 @@ void csr_ll_insert_tail(tDblLinkList *pList, tListElem *pEntry,
 			bool fInterlocked)
 {
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -286,7 +286,7 @@ void csr_ll_insert_head(tDblLinkList *pList, tListElem *pEntry,
 {
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -312,7 +312,7 @@ void csr_ll_insert_entry(tDblLinkList *pList, tListElem *pEntry,
 			 tListElem *pNewEntry, bool fInterlocked)
 {
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -334,7 +334,7 @@ tListElem *csr_ll_remove_tail(tDblLinkList *pList, bool fInterlocked)
 	tListElem *pEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pEntry;
 	}
@@ -362,7 +362,7 @@ tListElem *csr_ll_peek_tail(tDblLinkList *pList, bool fInterlocked)
 	tListElem *pEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pEntry;
 	}
@@ -388,7 +388,7 @@ tListElem *csr_ll_remove_head(tDblLinkList *pList, bool fInterlocked)
 	tListElem *pEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pEntry;
 	}
@@ -416,7 +416,7 @@ tListElem *csr_ll_peek_head(tDblLinkList *pList, bool fInterlocked)
 	tListElem *pEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pEntry;
 	}
@@ -442,7 +442,7 @@ void csr_ll_purge(tDblLinkList *pList, bool fInterlocked)
 	tListElem *pEntry;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return;
 	}
@@ -468,7 +468,7 @@ bool csr_ll_remove_entry(tDblLinkList *pList, tListElem *pEntryToRemove,
 	tListElem *pEntry;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return fFound;
 	}
@@ -510,7 +510,7 @@ tListElem *csr_ll_next(tDblLinkList *pList, tListElem *pEntry,
 	tListElem *pNextEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pNextEntry;
 	}
@@ -543,7 +543,7 @@ tListElem *csr_ll_previous(tDblLinkList *pList, tListElem *pEntry,
 	tListElem *pNextEntry = NULL;
 
 	if (!pList) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Error!! pList is Null", __func__);
 		return pNextEntry;
 	}
diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c
index 1fad09f45e4b..60599908bd22 100644
--- a/core/sme/src/csr/csr_neighbor_roam.c
+++ b/core/sme/src/csr/csr_neighbor_roam.c
@@ -66,7 +66,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal pMac,
 	mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState = \
 		mac_ctx->roam.neighborRoamInfo[session].neighborRoamState; \
 	mac_ctx->roam.neighborRoamInfo[session].neighborRoamState = newstate; \
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, \
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, \
 		FL("Sessionid (%d) NeighborRoam transition from %s to %s"), \
 		session, csr_neighbor_roam_state_to_string( \
 		mac_ctx->roam.neighborRoamInfo[session].prevNeighborRoamState),\
@@ -876,7 +876,7 @@ static QDF_STATUS csr_neighbor_roam_issue_preauth_req(tpAniSirGlobal mac_ctx,
 
 	if (false != neighbor_roam_info->FTRoamInfo.preauthRspPending) {
 		/* This must not be true here */
-		CDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending ==
+		QDF_ASSERT(neighbor_roam_info->FTRoamInfo.preauthRspPending ==
 			   false);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1170,7 +1170,7 @@ csr_neighbor_roam_offload_update_preauth_list(tpAniSirGlobal pMac,
 	CSR_NEIGHBOR_ROAM_STATE_TRANSITION
 		(pMac, eCSR_NEIGHBOR_ROAM_STATE_PREAUTH_DONE, session_id)
 	neighbor_roam_info_ptr->FTRoamInfo.numPreAuthRetries = 0;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "LFR3:Entry added to Auth Done List");
 
 	return QDF_STATUS_SUCCESS;
@@ -1201,7 +1201,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
 	struct roam_ext_params *roam_params;
 	uint8_t num_ch = 0;
 
-	CDF_ASSERT(pScanFilter != NULL);
+	QDF_ASSERT(pScanFilter != NULL);
 	if (pScanFilter == NULL)
 		return QDF_STATUS_E_FAILURE;
 
@@ -1232,7 +1232,7 @@ csr_neighbor_roam_prepare_scan_profile_filter(tpAniSirGlobal pMac,
 				 &nbr_roam_info->handoffReqInfo.bssid);
 		}
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		FL("No of Allowed SSID List:%d"),
 		roam_params->num_ssid_allowed_list);
 	if (roam_params->num_ssid_allowed_list) {
@@ -1445,7 +1445,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 			if (NULL == scan_result)
 				break;
 			descr = &scan_result->BssDescriptor;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				  FL("Scan result: BSSID " MAC_ADDRESS_STR
 				     " (Rssi %ld, Ch:%d)"),
 				  MAC_ADDR_ARRAY(descr->bssId),
@@ -1458,8 +1458,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 				 * currently associated AP. Do not have this
 				 * in the roamable AP list
 				 */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO,
 					  "SKIP-currently associated AP");
 				continue;
 			}
@@ -1474,8 +1474,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 					sizeof(tSirMacAddr)))
 			     || (descr->channelId !=
 				 n_roam_info->handoffReqInfo.channel))) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO,
 					  "SKIP-not a candidate AP for OS requested roam");
 				continue;
 			}
@@ -1508,15 +1508,15 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 					n_roam_info->MinQBssLoadRequired);
 			if (voadmitted && qpresent &&
 			    (qavail < n_roam_info->MinQBssLoadRequired)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_INFO,
 					"BSSID : " MAC_ADDRESS_STR " has no bandwidth, ignoring",
 					MAC_ADDR_ARRAY(descr->bssId));
 				continue;
 			}
 			if (voadmitted && !qpresent) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_INFO,
 					"BSSID : " MAC_ADDRESS_STR " has no QBSS LOAD IE, ignoring",
 					MAC_ADDR_ARRAY(descr->bssId));
 				continue;
@@ -1541,8 +1541,8 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 					descr->nReceivedTime;
 			if (age_constraint == true && age_ticks > limit_ticks) {
 				num_dropped++;
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_WARN,
 					FL("Old AP (probe rsp/beacon) skipped.")
 					);
 				continue;
@@ -1587,7 +1587,7 @@ csr_neighbor_roam_process_scan_results(tpAniSirGlobal mac_ctx,
 		 * iterations and no candidate were found
 		 */
 		if (age_constraint == false) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: No roam able candidates found",
 				  __func__);
 			break;
@@ -1713,7 +1713,7 @@ QDF_STATUS csr_neighbor_roam_channels_filter_by_current_band(tpAniSirGlobal pMac
 		return QDF_STATUS_E_INVAL;
 
 	if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Wrong Number of Input Channels %d",
 			  __func__, inputNumOfChannels);
 		return QDF_STATUS_E_INVAL;
@@ -1774,13 +1774,13 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac,
 		return QDF_STATUS_E_INVAL;
 
 	if (inputNumOfChannels > WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Wrong Number of Input Channels %d",
 			  __func__, inputNumOfChannels);
 		return QDF_STATUS_E_INVAL;
 	}
 	if (outputNumOfChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: Wrong Number of Output Channels %d",
 			  __func__, outputNumOfChannels);
 		return QDF_STATUS_E_INVAL;
@@ -1793,8 +1793,8 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac,
 		}
 		if (j == outputNumOfChannels) {
 			if (pInputChannelList[i]) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: [INFOLOG] Adding extra %d to Neighbor channel list",
 					  __func__, pInputChannelList[i]);
 				pOutputChannelList[numChannels] =
@@ -1803,7 +1803,7 @@ QDF_STATUS csr_neighbor_roam_merge_channel_lists(tpAniSirGlobal pMac,
 			}
 		}
 		if (numChannels >= WNI_CFG_VALID_CHANNEL_LIST_LEN) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "%s: Merge Neighbor channel list reached Max "
 				  "limit %d", __func__, numChannels);
 			break;
@@ -1885,8 +1885,8 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba
 					    get_rf_band(pNeighborBssDesc->
 							pNeighborBssDescription->
 							channel)) {
-						CDF_TRACE(QDF_MODULE_ID_SME,
-							  CDF_TRACE_LEVEL_INFO,
+						QDF_TRACE(QDF_MODULE_ID_SME,
+							  QDF_TRACE_LEVEL_INFO,
 							  "%s: [INFOLOG] Adding %d to Neighbor channel list (Same band)\n",
 							  __func__,
 							  pNeighborBssDesc->
@@ -1899,8 +1899,8 @@ QDF_STATUS csr_neighbor_roam_create_chan_list_from_neighbor_report(tpAniSirGloba
 						numChannels++;
 					}
 				} else {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_INFO,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_INFO,
 						  "%s: [INFOLOG] Adding %d to Neighbor channel list\n",
 						  __func__,
 						  pNeighborBssDesc->
@@ -2212,7 +2212,7 @@ void csr_roam_reset_roam_params(tpAniSirGlobal mac_ctx)
 	 * clear all the whitelist parameters and remaining
 	 * needs to be retained across connections.
 	 */
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		FL("Roaming parameters are reset"));
 	roam_params = &mac_ctx->roam.configParam.roam_params;
 	roam_params->num_ssid_allowed_list = 0;
@@ -2246,7 +2246,7 @@ QDF_STATUS csr_neighbor_roam_indicate_disconnect(tpAniSirGlobal pMac,
 		sms_log(pMac, LOGE, FL("pSession is NULL"));
 		return QDF_STATUS_E_FAILURE;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			FL("Disconn ind on session %d in state %d from bss :"
 			MAC_ADDRESS_STR), sessionId,
 			pNeighborRoamInfo->neighborRoamState,
@@ -2454,7 +2454,7 @@ static void csr_neighbor_roam_info_ctx_init(
 		 * down to firmware.Do not send the START command for
 		 * other session connections.*/
 		if (!csr_roam_is_sta_mode(pMac, session_id)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 				"Wrong Mode %d",
 				session->connectedProfile.BSSType);
 			return;
@@ -2463,8 +2463,8 @@ static void csr_neighbor_roam_info_ctx_init(
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 		if (session->roam_synch_in_progress) {
 			if (pMac->roam.pReassocResp != NULL) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_DEBUG,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_DEBUG,
 					"Free Reassoc Rsp");
 				cdf_mem_free(pMac->roam.pReassocResp);
 				pMac->roam.pReassocResp = NULL;
@@ -2535,11 +2535,11 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
 	if (session->roam_synch_in_progress &&
 		(eSIR_ROAM_AUTH_STATUS_AUTHENTICATED ==
 		session->roam_synch_data->authStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			"LFR3:csr_neighbor_roam_indicate_connect");
 		msg = cdf_mem_malloc(sizeof(tSirSetActiveModeSetBncFilterReq));
 		if (msg == NULL) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				"LFR3:Mem Alloc failed for beacon Filter Req");
 			return QDF_STATUS_E_NOMEM;
 		}
@@ -2905,7 +2905,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
 	uint32_t roamid = 0;
 	QDF_STATUS status;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG, "%s session_id=%d",
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG, "%s session_id=%d",
 		  __func__, session_id);
 
 	if (neighbor_roam_info->neighborRoamState !=
@@ -2919,11 +2919,11 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
 
 	if (false == csr_neighbor_roam_get_handoff_ap_info(mac_ctx,
 			&handoff_node, session_id)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 		FL("failed to obtain handoff AP"));
 		return;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  FL("HANDOFF CANDIDATE BSSID "MAC_ADDRESS_STR),
 		  MAC_ADDR_ARRAY(handoff_node.pBssDescription->bssId));
 
@@ -2949,7 +2949,7 @@ void csr_neighbor_roam_request_handoff(tpAniSirGlobal mac_ctx,
 	status = csr_roam_copy_connected_profile(mac_ctx, session_id,
 			&neighbor_roam_info->csrNeighborRoamProfile);
 	if (QDF_STATUS_SUCCESS != status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("csr_roam_copy_connected_profile failed %d"),
 			status);
 		return;
@@ -3037,7 +3037,7 @@ bool csr_neighbor_roam_get_handoff_ap_info(tpAniSirGlobal pMac,
 	tpCsrNeighborRoamBSSInfo bss_node = NULL;
 
 	if (NULL == hand_off_node) {
-		CDF_ASSERT(NULL != hand_off_node);
+		QDF_ASSERT(NULL != hand_off_node);
 		return false;
 	}
 	if (ngbr_roam_info->is11rAssoc) {
@@ -3124,7 +3124,7 @@ void csr_neighbor_roam_tranistion_preauth_done_to_disconnected(tpAniSirGlobal pM
 	tCsrRoamSession *session = CSR_GET_SESSION(pMac, sessionId);
 
 	if (!session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 			  FL("session is NULL"));
 		return;
 	}
diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c
index b6e2476d7698..fa9657931d6a 100644
--- a/core/sme/src/csr/csr_tdls_process.c
+++ b/core/sme/src/csr/csr_tdls_process.c
@@ -114,7 +114,7 @@ QDF_STATUS csr_tdls_send_mgmt_req(tHalHandle hHal, uint8_t sessionId,
 		if (NULL == tdlsSendMgmtCmdInfo->buf) {
 			status = QDF_STATUS_E_NOMEM;
 			sms_log(pMac, LOGE, FL("Alloc Failed"));
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return status;
 		}
 		cdf_mem_copy(tdlsSendMgmtCmdInfo->buf, tdlsSendMgmt->buf,
@@ -361,7 +361,7 @@ QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type,
 	pMsg->type = msg_type;
 	pMsg->msgLen = (uint16_t) (msg_size);
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  ("sending msg = %d"), pMsg->type);
 	/* Send message. */
 	if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) {
@@ -399,7 +399,7 @@ QDF_STATUS csr_tdls_process_send_mgmt(tpAniSirGlobal pMac, tSmeCmd *cmd)
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE, FL("alloc failed"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 	tdlsSendMgmtReq->sessionId = cmd->sessionId;
@@ -467,7 +467,7 @@ QDF_STATUS csr_tdls_process_add_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE, FL("alloc failed"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 	tdlsAddStaReq->sessionId = cmd->sessionId;
@@ -538,7 +538,7 @@ QDF_STATUS csr_tdls_process_del_sta(tpAniSirGlobal pMac, tSmeCmd *cmd)
 
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE, FL("alloc failed"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 	tdlsDelStaReq->sessionId = cmd->sessionId;
@@ -631,7 +631,7 @@ QDF_STATUS csr_tdls_process_link_establish(tpAniSirGlobal pMac, tSmeCmd *cmd)
 
 	if (tdlsLinkEstablishReq == NULL) {
 		sms_log(pMac, LOGE, FL("alloc failed"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_NOMEM;
 	}
 	tdlsLinkEstablishReq->sessionId = cmd->sessionId;
@@ -772,7 +772,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
 	case eWNI_SME_TDLS_SHOULD_DISCOVER:
 		qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_SHOULD_DISCOVER for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
 				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
@@ -784,7 +784,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
 	case eWNI_SME_TDLS_SHOULD_TEARDOWN:
 		qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_SHOULD_TEARDOWN for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
 				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
@@ -796,7 +796,7 @@ QDF_STATUS tdls_msg_processor(tpAniSirGlobal pMac, uint16_t msgType,
 	case eWNI_SME_TDLS_PEER_DISCONNECTED:
 		qdf_copy_macaddr(&roamInfo.peerMac, &tevent->peermac);
 		roamInfo.reasonCode = tevent->peer_reason;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				"%s: eWNI_SME_TDLS_PEER_DISCONNECTED for peer mac: "
 				MAC_ADDRESS_STR " peer_reason: %d",
 				__func__, MAC_ADDR_ARRAY(tevent->peermac.bytes),
diff --git a/core/sme/src/csr/csr_util.c b/core/sme/src/csr/csr_util.c
index 87dba98af6f4..3107e086de4e 100644
--- a/core/sme/src/csr/csr_util.c
+++ b/core/sme/src/csr/csr_util.c
@@ -1185,7 +1185,7 @@ eCsrMediaAccessType csr_get_qo_s_from_bss_desc(tHalHandle hHal,
 	eCsrMediaAccessType qosType = eCSR_MEDIUM_ACCESS_DCF;
 
 	if (NULL == pIes) {
-		CDF_ASSERT(pIes != NULL);
+		QDF_ASSERT(pIes != NULL);
 		return qosType;
 	}
 
@@ -1259,7 +1259,7 @@ QDF_STATUS csr_get_parsed_bss_description_ies(tHalHandle hHal,
 			}
 		} else {
 			sms_log(pMac, LOGE, FL(" failed to allocate memory"));
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_NOMEM;
 		}
 	}
@@ -1898,8 +1898,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid,
 
 		switch (cur_bss_persona) {
 		case QDF_STA_MODE:
-			CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_INFO,
 					FL("** STA session **"));
 			return QDF_STATUS_SUCCESS;
 
@@ -1909,8 +1909,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid,
 				&& (connect_state != temp)) {
 				/* allow IBSS+SAP for Emulation only */
 #ifndef QCA_WIFI_3_0_EMU
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("Can't start SAP"));
 				return QDF_STATUS_E_FAILURE;
 #endif
@@ -1921,8 +1921,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid,
 			temp = eCSR_ASSOC_STATE_TYPE_IBSS_DISCONNECTED;
 			if ((bss_persona == QDF_IBSS_MODE)
 					&& (connect_state != temp)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("Can't start SAP"));
 				return QDF_STATUS_E_FAILURE;
 			}
@@ -1931,8 +1931,8 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid,
 			if ((bss_persona == QDF_IBSS_MODE) &&
 				(connect_state ==
 					eCSR_ASSOC_STATE_TYPE_IBSS_CONNECTED)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("IBSS mode already exist"));
 				return QDF_STATUS_E_FAILURE;
 			} else if (((bss_persona == QDF_P2P_GO_MODE) ||
@@ -1941,21 +1941,21 @@ csr_isconcurrentsession_valid(tpAniSirGlobal mac_ctx, uint32_t cur_sessionid,
 					 eCSR_ASSOC_STATE_TYPE_NOT_CONNECTED)) {
 				/* allow IBSS+SAP for Emulation only */
 #ifndef QCA_WIFI_3_0_EMU
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_ERROR,
 						FL("Can't start GO/SAP"));
 				return QDF_STATUS_E_FAILURE;
 #endif
 			}
 			break;
 		case QDF_P2P_CLIENT_MODE:
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_INFO,
 				FL("**P2P-Client session**"));
 			return QDF_STATUS_SUCCESS;
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_ERROR,
 				FL("Persona not handled = %d"),
 				cur_bss_persona);
 			break;
@@ -2902,7 +2902,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal,
 		apProfileMFPRequired = (pRSNIe->RSN_Cap[0] >> 6) & 0x1;
 		if (*pFilterMFPEnabled && *pFilterMFPCapable
 		    && *pFilterMFPRequired && (apProfileMFPCapable == 0)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "AP is not capable to make PMF connection");
 			return false;
 		} else if (*pFilterMFPEnabled && *pFilterMFPCapable &&
@@ -2915,7 +2915,7 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal,
 			 * so if AP is not capable of PMF then drop it.
 			 * Don't try to connect with it.
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "we need PMF connection & AP isn't capable to make PMF connection");
 			return false;
 		} else if (!(*pFilterMFPCapable) &&
@@ -2926,12 +2926,12 @@ csr_is_pmf_capabilities_in_rsn_match(tHalHandle hHal,
 			 * requires mandatory PMF connections and we are not
 			 * capable so this AP is not good choice to connect
 			 */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "AP needs PMF connection and we are not capable of pmf connection");
 			return false;
 		} else if (!(*pFilterMFPEnabled) && *pFilterMFPCapable &&
 			   (apProfileMFPCapable == 1)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "we don't need PMF connection even though both parties are capable");
 			return false;
 		}
diff --git a/core/sme/src/nan/nan_api.c b/core/sme/src/nan/nan_api.c
index 489e6713ec9f..849d5fb88ace 100644
--- a/core/sme/src/nan/nan_api.c
+++ b/core/sme/src/nan/nan_api.c
@@ -51,7 +51,7 @@ void sme_nan_register_callback(tHalHandle hHal, NanCallback callback)
 	tpAniSirGlobal pMac = NULL;
 
 	if (NULL == hHal) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("hHal is not valid"));
 		return;
 	}
@@ -82,7 +82,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input)
 	data = cdf_mem_malloc(data_len);
 
 	if (data == NULL) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Memory allocation failure"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -99,7 +99,7 @@ QDF_STATUS sme_nan_request(tpNanRequestReq input)
 	msg.bodyptr = data;
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(QDF_MODULE_ID_WMA, &msg)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Not able to post WMA_NAN_REQUEST message to WMA"));
 		cdf_mem_free(data);
@@ -129,11 +129,11 @@ QDF_STATUS sme_nan_event(tHalHandle hHal, void *pMsg)
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 
 	if (NULL == pMsg) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("msg ptr is NULL"));
 		status = QDF_STATUS_E_FAILURE;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  FL("SME: Received sme_nan_event"));
 		if (pMac->sme.nanCallback) {
 			pMac->sme.nanCallback(pMac->hHdd,
diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c
index 1cab83d7e2b7..3f84dfbc1b6e 100644
--- a/core/sme/src/p2p/p2p_api.c
+++ b/core/sme/src/p2p/p2p_api.c
@@ -74,7 +74,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac,
 	if (NULL == pMsg)
 		goto error;
 	else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO, "%s call",
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO, "%s call",
 			  __func__);
 		cdf_mem_set(pMsg, sizeof(tSirRemainOnChnReq), 0);
 		pMsg->messageType = eWNI_SME_REMAIN_ON_CHANNEL_REQ;
@@ -311,7 +311,7 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId,
 	tSirMbMsgP2p *pMsg;
 	uint16_t msgLen;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 		  " %s sends action frame", __func__);
 	msgLen = (uint16_t) ((sizeof(tSirMbMsgP2p)) + len);
 	pMsg = cdf_mem_malloc(msgLen);
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index 0342026ab51f..64eb0feacaca 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -516,7 +516,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac)
 	sme_QosSessionInfo *pSession;
 	uint8_t sessionId;
 	QDF_STATUS status;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: initializing SME-QoS module", __func__, __LINE__);
 	/* init the control block */
 	/* (note that this will make all sessions invalid) */
@@ -527,7 +527,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac)
 	/* init flow list */
 	status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: %d: cannot initialize Flow List",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -541,7 +541,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac)
 		/* initialize the session's buffered command list */
 		status = csr_ll_open(pMac->hHdd, &pSession->bufferedCommandList);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 				  "%s: %d: cannot initialize cmd list for session %d",
 				  __func__, __LINE__, sessionId);
 			return QDF_STATUS_E_FAILURE;
@@ -549,7 +549,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac)
 		pSession->readyForPowerSave = true;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: done initializing SME-QoS module",
 		  __func__, __LINE__);
 	return QDF_STATUS_SUCCESS;
@@ -568,7 +568,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac)
 	sme_QosSessionInfo *pSession;
 	sme_QosEdcaAcType ac;
 	uint8_t sessionId;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: closing down SME-QoS", __func__, __LINE__);
 
 	/* cleanup control block */
@@ -606,7 +606,7 @@ QDF_STATUS sme_qos_close(tpAniSirGlobal pMac)
 		pSession->sessionActive = false;
 		pSession->readyForPowerSave = true;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: closed down QoS", __func__, __LINE__);
 	return QDF_STATUS_SUCCESS;
 }
@@ -650,18 +650,18 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId,
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	sme_QosStatusType status;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Setup requested by client on session %d",
 		  __func__, __LINE__, sessionId);
 	lock_status = sme_acquire_global_lock(&pMac->sme);
 	if (!QDF_IS_STATUS_SUCCESS(lock_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Unable to obtain lock", __func__, __LINE__);
 		return SME_QOS_STATUS_SETUP_FAILURE_RSP;
 	}
 	/* Make sure the session is valid */
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Supplied Session ID %d is invalid",
 			  __func__, __LINE__, sessionId);
 		status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
@@ -669,14 +669,14 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId,
 		/* Make sure the session is active */
 		pSession = &sme_qos_cb.sessionInfo[sessionId];
 		if (!pSession->sessionActive) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: Supplied Session ID %d is inactive",
 				  __func__, __LINE__, sessionId);
 			status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
 		} else {
 			/* Assign a Flow ID */
 			*pQosFlowID = sme_qos_assign_flow_id();
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: QoS request on session %d assigned Flow ID %d",
 				  __func__, __LINE__, sessionId, *pQosFlowID);
 			/* Call the internal function for QoS setup, */
@@ -690,7 +690,7 @@ sme_QosStatusType sme_qos_setup_req(tHalHandle hHal, uint32_t sessionId,
 		}
 	}
 	sme_release_global_lock(&pMac->sme);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS setup return status on session %d is %d",
 		  __func__, __LINE__, sessionId, status);
 	return status;
@@ -722,19 +722,19 @@ sme_QosStatusType sme_qos_modify_req(tHalHandle hHal,
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	sme_QosStatusType status;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Modify requested by client for Flow %d",
 		  __func__, __LINE__, QosFlowID);
 	lock_status = sme_acquire_global_lock(&pMac->sme);
 	if (!QDF_IS_STATUS_SUCCESS(lock_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Unable to obtain lock", __func__, __LINE__);
 		return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
 	}
 	/* Call the internal function for QoS modify, adding a layer of abstraction */
 	status = sme_qos_internal_modify_req(pMac, pQoSInfo, QosFlowID, false);
 	sme_release_global_lock(&pMac->sme);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Modify return status on Flow %d is %d",
 		  __func__, __LINE__, QosFlowID, status);
 	return status;
@@ -759,19 +759,19 @@ sme_QosStatusType sme_qos_release_req(tHalHandle hHal, uint32_t QosFlowID)
 	QDF_STATUS lock_status = QDF_STATUS_E_FAILURE;
 	tpAniSirGlobal pMac = PMAC_STRUCT(hHal);
 	sme_QosStatusType status;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Release requested by client for Flow %d",
 		  __func__, __LINE__, QosFlowID);
 	lock_status = sme_acquire_global_lock(&pMac->sme);
 	if (!QDF_IS_STATUS_SUCCESS(lock_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Unable to obtain lock", __func__, __LINE__);
 		return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
 	}
 	/* Call the internal function for QoS release, adding a layer of abstraction */
 	status = sme_qos_internal_release_req(pMac, QosFlowID, false);
 	sme_release_global_lock(&pMac->sme);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Release return status on Flow %d is %d",
 		  __func__, __LINE__, QosFlowID, status);
 	return status;
@@ -800,7 +800,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx,
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	tListElem *entry = NULL;
 	tSmeCmd *command;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		FL(" msg = %d for QoS"), msg_type);
 	/* switch on the msg type & make the state transition accordingly */
 	switch (msg_type) {
@@ -845,7 +845,7 @@ QDF_STATUS sme_qos_msg_processor(tpAniSirGlobal mac_ctx,
 		break;
 	default:
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("unknown msg type = %d"),
 			msg_type);
 		break;
@@ -869,14 +869,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac,
 {
 	tDot11fBeaconIEs *pIes = NULL;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: validation for QAP & APSD", __func__, __LINE__);
 	do {
 		if (!QDF_IS_STATUS_SUCCESS(
 			csr_get_parsed_bss_description_ies(
 				pMac, pBssDesc,	&pIes))) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: csr_get_parsed_bss_description_ies() failed",
 				  __func__, __LINE__);
 			break;
@@ -884,7 +884,7 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac,
 		/* check if the AP is QAP & it supports APSD */
 		if (!CSR_IS_QOS_BSS(pIes)) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: AP doesn't support QoS",
 				  __func__, __LINE__);
 
@@ -893,14 +893,14 @@ QDF_STATUS sme_qos_validate_params(tpAniSirGlobal pMac,
 		if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD) &&
 		    !(pIes->WMMInfoAp.uapsd)) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: AP doesn't support APSD",
 				  __func__, __LINE__);
 			break;
 		}
 		status = QDF_STATUS_SUCCESS;
 	} while (0);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: validated with status = %d",
 		  __func__, __LINE__, status);
 	if (pIes) {
@@ -926,7 +926,7 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac,
 				 sme_qos_csr_event_indType ind, void *pEvent_info)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: On Session %d Event %d received from CSR",
 		  __func__, __LINE__, sessionId, ind);
 	switch (ind) {
@@ -992,12 +992,12 @@ QDF_STATUS sme_qos_csr_event_ind(tpAniSirGlobal pMac,
 		break;
 	default:
 		/* Err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On Session %d Unknown Event %d received from CSR",
 			  __func__, __LINE__, sessionId, ind);
 		break;
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: On Session %d processed Event %d with status %d",
 		  __func__, __LINE__, sessionId, ind, status);
 	return status;
@@ -1020,7 +1020,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes
 {
 	sme_QosEdcaAcType ac;
 	uint8_t acm_mask = 0;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked", __func__, __LINE__);
 	for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) {
 		if (sme_qos_is_acm(pMac, pSirBssDesc, ac, pIes)) {
@@ -1028,7 +1028,7 @@ uint8_t sme_qos_get_acm_mask(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDes
 		}
 
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: mask is %d", __func__, __LINE__, acm_mask);
 	return acm_mask;
 }
@@ -1086,19 +1086,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 	uint8_t new_tmask = 0;
 	sme_QosSearchInfo search_key;
 	QDF_STATUS hstatus;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for flow %d",
 		  __func__, __LINE__, sessionId, QosFlowID);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 	/* if caller sent an empty TSPEC, fill up with the default one */
 	if (!pQoSInfo) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  "%s: %d: caller sent an empty QoS param list, using defaults",
 			  __func__, __LINE__);
 		/* find the AC with UPType passed in */
 		ac = sme_qos_up_to_ac(UPType);
 		if (SME_QOS_EDCA_AC_MAX == ac) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: invalid AC %d from UP %d",
 				  __func__, __LINE__, ac, UPType);
 
@@ -1109,7 +1109,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		/* find the AC */
 		ac = sme_qos_up_to_ac(pQoSInfo->ts_info.up);
 		if (SME_QOS_EDCA_AC_MAX == ac) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: invalid AC %d from UP %d",
 				  __func__, __LINE__, ac, pQoSInfo->ts_info.up);
 
@@ -1117,7 +1117,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		}
 		/* validate QoS params */
 		if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: invalid params", __func__, __LINE__);
 			return SME_QOS_STATUS_SETUP_INVALID_PARAMS_RSP;
 		}
@@ -1133,7 +1133,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 	 * confuse PE with back to back Addts or Addts followed by Reassoc
 	 */
 	if (sme_qos_is_rsp_pending(sessionId, ac)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: buffering the setup request for flow %d in state %d "
 			  "since another request is pending",
 			  __func__, __LINE__, QosFlowID, pACInfo->curr_state);
@@ -1149,7 +1149,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		cmd.u.setupCmdInfo.QosFlowID = QosFlowID;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't buffer the setup request in state = %d",
 				  __func__, __LINE__, pACInfo->curr_state);
 			/* unable to buffer the request */
@@ -1157,7 +1157,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			pSession->readyForPowerSave = true;
 			return SME_QOS_STATUS_SETUP_FAILURE_RSP;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Buffered setup request for flow = %d",
 			  __func__, __LINE__, QosFlowID);
 		return SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
@@ -1168,7 +1168,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		/* call the internal qos setup logic to decide on if the */
 		/* request is NOP, or need reassoc for APSD and/or need to send out ADDTS */
 		status = sme_qos_setup(pMac, sessionId, &Tspec_Info, ac);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: On session %d with AC %d in state SME_QOS_LINK_UP "
 			  "sme_qos_setup returned with status %d",
 			  __func__, __LINE__, sessionId, ac, status);
@@ -1185,8 +1185,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			/* create an entry in the flow list */
 			pentry = cdf_mem_malloc(sizeof(*pentry));
 			if (!pentry) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: couldn't allocate memory for the new "
 					  "entry in the Flow List", __func__,
 					  __LINE__);
@@ -1205,15 +1205,15 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP == status) {
 				if (pACInfo->tspec_mask_status &&
 				    !pACInfo->reassoc_pending) {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: On session %d with AC %d in state "
 						  "SME_QOS_LINK_UP tspec_mask_status is %d "
 						  "but should not be set yet",
 						  __func__, __LINE__, sessionId,
 						  ac,
 						  pACInfo->tspec_mask_status);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					cdf_mem_free(pentry);
 					return SME_QOS_STATUS_SETUP_FAILURE_RSP;
 				}
@@ -1250,7 +1250,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			/* Flow List at the end */
 			pentry->tspec_mask = pACInfo->tspec_mask_status;
 			pentry->QoSInfo = Tspec_Info;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Creating entry on session %d at %p with flowID %d",
 				  __func__, __LINE__,
 				  sessionId, pentry, QosFlowID);
@@ -1258,7 +1258,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 					   true);
 		} else {
 			/* unexpected status returned by sme_qos_setup() */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d unexpected status %d "
 				  "returned by sme_qos_setup",
 				  __func__, __LINE__, sessionId, status);
@@ -1274,7 +1274,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		break;
 	case SME_QOS_HANDOFF:
 	case SME_QOS_REQUESTED:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: Buffering setup request for flow %d in state = %d",
 			  __func__, __LINE__, QosFlowID, pACInfo->curr_state);
 		/* buffer cmd */
@@ -1289,7 +1289,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		cmd.u.setupCmdInfo.QosFlowID = QosFlowID;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d couldn't buffer the setup "
 				  "request for flow %d in state = %d",
 				  __func__, __LINE__,
@@ -1311,19 +1311,19 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			if (CSR_IS_ADDTS_WHEN_ACMOFF_SUPPORTED(pMac) ||
 			    sme_qos_is_acm(pMac, pSession->assocInfo.pBssDesc, ac,
 					   NULL)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_MED,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_MED,
 					  "%s: %d: tspec_mask_status = %d for AC = %d",
 					  __func__, __LINE__,
 					  pACInfo->tspec_mask_status, ac);
 				if (!pACInfo->tspec_mask_status) {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: tspec_mask_status can't be 0 for ac = %d in "
 						  "state = %d", __func__,
 						  __LINE__, ac,
 						  pACInfo->curr_state);
-					CDF_ASSERT(0);
+					QDF_ASSERT(0);
 					/* unable to service the request */
 					/* nothing is pending so vote powersave back on */
 					pSession->readyForPowerSave = true;
@@ -1402,8 +1402,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 							SME_QOS_TSPEC_MASK_BIT_1_SET;
 					}
 				} else {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_INFO_MED,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_INFO_MED,
 						  "%s: %d: wrong tmask = %d",
 						  __func__, __LINE__,
 						  pACInfo->tspec_mask_status);
@@ -1414,11 +1414,11 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 				/* to aggregate to calculate trigger frame parameters */
 				tmask = SME_QOS_TSPEC_MASK_BIT_1_SET;
 			}
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 				  "%s: %d: tmask = %d, new_tmask = %d in state = %d",
 				  __func__, __LINE__,
 				  tmask, new_tmask, pACInfo->curr_state);
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 				  "%s: %d: tspec_mask_status = %d for AC = %d",
 				  __func__, __LINE__,
 				  pACInfo->tspec_mask_status, ac);
@@ -1460,8 +1460,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 
 				if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
 					/* err msg */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: failed to aggregate params",
 						  __func__, __LINE__);
 					/* unable to service the request */
@@ -1480,10 +1480,10 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 					Tspec_Info;
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: no flows running for ac = %d while in state = %d",
 				  __func__, __LINE__, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			/* unable to service the request */
 			/* nothing is pending so vote powersave back on */
 			pSession->readyForPowerSave = true;
@@ -1501,7 +1501,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 		status =
 			sme_qos_setup(pMac, sessionId,
 				      &pACInfo->requested_QoSInfo[tmask - 1], ac);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
 			  "sme_qos_setup returned with status %d", __func__,
 			  __LINE__, sessionId, ac, status);
@@ -1520,8 +1520,8 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 				(sme_QosFlowInfoEntry *)
 				cdf_mem_malloc(sizeof(*pentry));
 			if (!pentry) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: couldn't allocate memory for the new "
 					  "entry in the Flow List", __func__,
 					  __LINE__);
@@ -1533,7 +1533,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			pentry->hoRenewal = hoRenewal;
 			pentry->QosFlowID = QosFlowID;
 			pentry->sessionId = sessionId;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Creating flow %d",
 				  __func__, __LINE__, QosFlowID);
 			if ((SME_QOS_STATUS_SETUP_SUCCESS_NO_ACM_NO_APSD_RSP ==
@@ -1570,9 +1570,9 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 								sme_qos_setup_fnp);
 						if (!QDF_IS_STATUS_SUCCESS
 							    (hstatus)) {
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SME,
-								CDF_TRACE_LEVEL_ERROR,
+								QDF_TRACE_LEVEL_ERROR,
 								"%s: %d: couldn't notify other "
 								"entries on this AC =%d",
 								__func__, __LINE__,
@@ -1594,7 +1594,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 			/* Flow List at the end */
 			pentry->tspec_mask = tmask;
 			pentry->QoSInfo = Tspec_Info;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: On session %d creating entry at %p with flowID %d",
 				  __func__, __LINE__,
 				  sessionId, pentry, QosFlowID);
@@ -1602,7 +1602,7 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 					   true);
 		} else {
 			/* unexpected status returned by sme_qos_setup() */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d unexpected status %d "
 				  "returned by sme_qos_setup",
 				  __func__, __LINE__, sessionId, status);
@@ -1612,13 +1612,13 @@ sme_QosStatusType sme_qos_internal_setup_req(tpAniSirGlobal pMac,
 	case SME_QOS_CLOSED:
 	case SME_QOS_INIT:
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: setup requested in unexpected state = %d",
 			  __func__, __LINE__, pACInfo->curr_state);
 		/* unable to service the request */
 		/* nothing is pending so vote powersave back on */
 		pSession->readyForPowerSave = true;
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		new_state = pACInfo->curr_state;
 	}
 	/* if current state is same as previous no need for transistion,
@@ -1678,7 +1678,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 	sme_QosCmdInfo cmd;
 	uint8_t sessionId;
 	QDF_STATUS hstatus;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID);
 
 	cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo));
@@ -1690,7 +1690,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 	pEntry = sme_qos_find_in_flow_list(search_key);
 	if (!pEntry) {
 		/* Err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: no match found for flowID = %d",
 			  __func__, __LINE__, QosFlowID);
 		return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
@@ -1705,7 +1705,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 
 	/* validate QoS params */
 	if (!sme_qos_validate_requested_params(pMac, pQoSInfo, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: invalid params", __func__, __LINE__);
 		return SME_QOS_STATUS_MODIFY_SETUP_INVALID_PARAMS_RSP;
 	}
@@ -1714,7 +1714,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 	     flow_info->QoSInfo.ts_info.direction)
 	    || (pQoSInfo->ts_info.up != flow_info->QoSInfo.ts_info.up)
 	    || (pQoSInfo->ts_info.tid != flow_info->QoSInfo.ts_info.tid)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Modification of direction/tid/up is not allowed",
 			  __func__, __LINE__);
 
@@ -1742,7 +1742,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		flow_info->QoSInfo.suspension_interval) &&
 	    (pQoSInfo->surplus_bw_allowance ==
 		flow_info->QoSInfo.surplus_bw_allowance)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"%s: %d: the addts parameters are same as last request,"
 			"dropping the current request", __func__, __LINE__);
 
@@ -1758,7 +1758,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 	 * confuse PE with back to back Addts or Addts followed by Reassoc
 	 */
 	if (sme_qos_is_rsp_pending(sessionId, ac)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: buffering the modify request for flow %d in state %d "
 			  "since another request is pending",
 			  __func__, __LINE__, QosFlowID, pACInfo->curr_state);
@@ -1770,7 +1770,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't buffer the modify request in state = %d",
 				  __func__, __LINE__, pACInfo->curr_state);
 			/* unable to buffer the request */
@@ -1778,7 +1778,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 			pSession->readyForPowerSave = true;
 			return SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Buffered modify request for flow = %d",
 			  __func__, __LINE__, QosFlowID);
 		return SME_QOS_STATUS_MODIFY_SETUP_PENDING_RSP;
@@ -1792,7 +1792,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		pNewEntry =
 			(sme_QosFlowInfoEntry *) cdf_mem_malloc(sizeof(*pNewEntry));
 		if (!pNewEntry) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't allocate memory for the new "
 				  "entry in the Flow List", __func__, __LINE__);
 			/* unable to service the request */
@@ -1812,7 +1812,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		pNewEntry->QoSInfo = *pQoSInfo;
 		/* update the entry from Flow List which needed to be modified */
 		flow_info->reason = SME_QOS_REASON_MODIFY;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: On session %d creating modified "
 			  "entry at %p with flowID %d",
 			  __func__, __LINE__,
@@ -1833,7 +1833,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 					       requested_QoSInfo[pNewEntry->
 								 tspec_mask - 1],
 					       ac);
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
 				  "sme_qos_setup returned with status %d",
 				  __func__, __LINE__, sessionId, ac, status);
@@ -1892,9 +1892,9 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 								sme_qos_modification_notify_fnp);
 						if (!QDF_IS_STATUS_SUCCESS
 							    (hstatus)) {
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SME,
-								CDF_TRACE_LEVEL_ERROR,
+								QDF_TRACE_LEVEL_ERROR,
 								"%s: %d: couldn't notify other "
 								"entries on this AC =%d",
 								__func__, __LINE__,
@@ -1923,8 +1923,8 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 
 			} else {
 				/* unexpected status returned by sme_qos_setup() */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: On session %d unexpected status %d "
 					  "returned by sme_qos_setup", __func__,
 					  __LINE__, sessionId, status);
@@ -1932,7 +1932,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 			}
 		} else {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: sme_qos_update_params() failed",
 				  __func__, __LINE__);
 			/* unable to service the request */
@@ -1953,7 +1953,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		break;
 	case SME_QOS_HANDOFF:
 	case SME_QOS_REQUESTED:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: Buffering modify request for flow %d in state = %d",
 			  __func__, __LINE__, QosFlowID, pACInfo->curr_state);
 		/* buffer cmd */
@@ -1964,7 +1964,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 		cmd.u.modifyCmdInfo.QoSInfo = *pQoSInfo;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't buffer the modify request in state = %d",
 				  __func__, __LINE__, pACInfo->curr_state);
 			/* unable to buffer the request */
@@ -1978,7 +1978,7 @@ sme_QosStatusType sme_qos_internal_modify_req(tpAniSirGlobal pMac,
 	case SME_QOS_INIT:
 	case SME_QOS_LINK_UP:
 	default:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: modify requested in unexpected state = %d",
 			  __func__, __LINE__, pACInfo->curr_state);
 		/* unable to service the request */
@@ -2028,7 +2028,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 	bool uplinkFlowsPresent = false;
 	bool downlinkFlowsPresent = false;
 	tListElem *pResult = NULL;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked for flow %d", __func__, __LINE__, QosFlowID);
 
 	cdf_mem_zero(&search_key, sizeof(sme_QosSearchInfo));
@@ -2041,7 +2041,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 
 	if (!pEntry) {
 		/* Err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: no match found for flowID = %d",
 			  __func__, __LINE__, QosFlowID);
 		return SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP;
@@ -2061,7 +2061,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 	 * confuse PE with back to back Addts or Addts followed by Reassoc
 	 */
 	if (sme_qos_is_rsp_pending(sessionId, ac)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: buffering the release request for flow %d in state %d "
 			  "since another request is pending",
 			  __func__, __LINE__, QosFlowID, pACInfo->curr_state);
@@ -2072,7 +2072,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 		cmd.u.releaseCmdInfo.QosFlowID = QosFlowID;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't buffer the release request in state = %d",
 				  __func__, __LINE__, pACInfo->curr_state);
 			/* unable to buffer the request */
@@ -2080,7 +2080,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 			pSession->readyForPowerSave = true;
 			return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
 		}
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Buffered release request for flow = %d",
 			  __func__, __LINE__, QosFlowID);
 		return SME_QOS_STATUS_RELEASE_REQ_PENDING_RSP;
@@ -2088,7 +2088,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 	/* get into the stat m/c to see if the request can be granted */
 	switch (pACInfo->curr_state) {
 	case SME_QOS_QOS_ON:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 			  "%s: %d: tspec_mask_status = %d for AC = %d with "
 			  "entry tspec_mask = %d",
 			  __func__, __LINE__,
@@ -2171,8 +2171,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 								SME_QOS_TSPEC_MASK_BIT_2_SET,
 								&Aggr_Tspec_Info);
 
-						CDF_TRACE(QDF_MODULE_ID_SME,
-							  CDF_TRACE_LEVEL_ERROR,
+						QDF_TRACE(QDF_MODULE_ID_SME,
+							  QDF_TRACE_LEVEL_ERROR,
 							  "%s: %d: On session %d buffering the AddTS request "
 							  "for AC %d in state %d as Addts is pending "
 							  "on other Tspec index of this AC",
@@ -2199,9 +2199,9 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 						if (!QDF_IS_STATUS_SUCCESS
 							    (sme_qos_buffer_cmd
 								    (&cmd, false))) {
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SME,
-								CDF_TRACE_LEVEL_ERROR,
+								QDF_TRACE_LEVEL_ERROR,
 								"%s: %d: On session %d unable to buffer the AddTS "
 								"request for AC %d TSPEC %d in state %d",
 								__func__, __LINE__,
@@ -2242,8 +2242,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 						       requested_QoSInfo
 						       [flow_info->tspec_mask -
 							1], ac);
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: On session %d with AC %d in state SME_QOS_QOS_ON "
 					  "sme_qos_setup returned with status %d",
 					  __func__, __LINE__, sessionId, ac,
@@ -2272,8 +2272,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 						requested_QoSInfo[flow_info->
 								  tspec_mask - 1];
 					/* delete the entry from Flow List */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_INFO_HIGH,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_INFO_HIGH,
 						  "%s: %d: Deleting entry at %p with flowID %d",
 						  __func__, __LINE__, flow_info,
 						  QosFlowID);
@@ -2295,9 +2295,9 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 								sme_qos_setup_fnp);
 						if (!QDF_IS_STATUS_SUCCESS
 							    (hstatus)) {
-							CDF_TRACE
+							QDF_TRACE
 								(QDF_MODULE_ID_SME,
-								CDF_TRACE_LEVEL_ERROR,
+								QDF_TRACE_LEVEL_ERROR,
 								"%s: %d: couldn't notify other "
 								"entries on this AC =%d",
 								__func__, __LINE__,
@@ -2321,8 +2321,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 					}
 				} else {
 					/* unexpected status returned by sme_qos_setup() */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: On session %d unexpected status %d "
 						  "returned by sme_qos_setup",
 						  __func__, __LINE__, sessionId,
@@ -2336,8 +2336,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 						requested_QoSInfo[flow_info->
 								  tspec_mask - 1];
 					/* delete the entry from Flow List */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_INFO_HIGH,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_INFO_HIGH,
 						  "%s: %d: On session %d deleting entry at "
 						  "%p with flowID %d", __func__,
 						  __LINE__, sessionId,
@@ -2361,8 +2361,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 				}
 			} else {
 				/* err msg */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: sme_qos_update_params() failed",
 					  __func__, __LINE__);
 				/* unable to service the request */
@@ -2428,8 +2428,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 								  tspec_mask);
 					if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
 						/* err msg */
-						CDF_TRACE(QDF_MODULE_ID_SME,
-							  CDF_TRACE_LEVEL_ERROR,
+						QDF_TRACE(QDF_MODULE_ID_SME,
+							  QDF_TRACE_LEVEL_ERROR,
 							  "%s: %d: sme_qos_del_ts_req() failed",
 							  __func__, __LINE__);
 						status =
@@ -2477,8 +2477,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 								  false);
 				if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
 					/* err msg */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: Reassoc failed",
 						  __func__, __LINE__);
 					status =
@@ -2492,8 +2492,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 					pACInfo->tspec_pending = 0;
 				}
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: nothing to do for AC = %d",
 					  __func__, __LINE__, ac);
 				/* we won't be waiting for a response from the AP */
@@ -2511,8 +2511,8 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 						       SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
 						       flow_info->QosFlowID);
 
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: Deleting entry at %p with flowID %d",
 					  __func__, __LINE__, flow_info,
 					  flow_info->QosFlowID);
@@ -2541,11 +2541,11 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 					new_state = SME_QOS_LINK_UP;
 				}
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: Exceeded the array bounds of pACInfo->num_flows",
 					  __func__, __LINE__);
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 				return
 					SME_QOS_STATUS_RELEASE_INVALID_PARAMS_RSP;
 			}
@@ -2562,7 +2562,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 				     sizeof(sme_QosWmmTspecInfo));
 			pACInfo->num_flows[flow_info->tspec_mask - 1]--;
 			/* delete the entry from Flow List */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: On session %d deleting entry at %p with flowID %d",
 				  __func__, __LINE__,
 				  sessionId, flow_info, QosFlowID);
@@ -2591,7 +2591,7 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 		cmd.u.releaseCmdInfo.QosFlowID = QosFlowID;
 		hstatus = sme_qos_buffer_cmd(&cmd, buffered_cmd);
 		if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: couldn't buffer the release request in state = %d",
 				  __func__, __LINE__, pACInfo->curr_state);
 			/* unable to service the request */
@@ -2606,10 +2606,10 @@ sme_QosStatusType sme_qos_internal_release_req(tpAniSirGlobal pMac,
 	case SME_QOS_LINK_UP:
 	default:
 		/* print error msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: release request in unexpected state = %d",
 			  __func__, __LINE__, pACInfo->curr_state);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		/* unable to service the request */
 		/* nothing is pending so vote powersave back on */
 		pSession->readyForPowerSave = true;
@@ -2671,20 +2671,20 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 	tCsrRoamModifyProfileFields modifyProfileFields;
 	QDF_STATUS hstatus;
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session Id %d is invalid",
 			  __func__, __LINE__, sessionId);
 		return status;
 	}
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 	if (!pSession->sessionActive) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session %d is inactive",
 			  __func__, __LINE__, sessionId);
 		return status;
 	}
 	if (!pSession->assocInfo.pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session %d has an Invalid BSS Descriptor",
 			  __func__, __LINE__, sessionId);
 		return status;
@@ -2693,7 +2693,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 						      pSession->assocInfo.pBssDesc,
 						      &pIes);
 	if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d unable to parse BSS IEs",
 			  __func__, __LINE__, sessionId);
 		return status;
@@ -2702,7 +2702,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 	/* success so pIes was allocated */
 
 	if (!CSR_IS_QOS_BSS(pIes)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d AP doesn't support QoS",
 			  __func__, __LINE__, sessionId);
 		cdf_mem_free(pIes);
@@ -2710,7 +2710,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 		return SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_DEBUG,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_DEBUG,
 		  "%s: %d: UAPSD/PSB set %d: ", __func__, __LINE__,
 		  pTspec_Info->ts_info.psb);
 
@@ -2726,8 +2726,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 			      qosInfo & SME_QOS_AP_SUPPORTS_APSD)
 			    && !(pIes->WMMInfoAp.uapsd)) {
 				/* application is looking for APSD but AP doesn't support it */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: On session %d AP doesn't support APSD",
 					  __func__, __LINE__, sessionId);
 				break;
@@ -2744,13 +2744,13 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 				qos_issue_command(pMac, sessionId, eSmeCommandAddTs,
 						  pTspec_Info, ac, 0);
 			if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: sme_qos_add_ts_req() failed",
 					  __func__, __LINE__);
 				break;
 			}
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: On session %d AddTS on AC %d is pending",
 				  __func__, __LINE__, sessionId, ac);
 			status = SME_QOS_STATUS_SETUP_REQ_PENDING_RSP;
@@ -2768,8 +2768,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 			    apsdMask & (1 << (SME_QOS_EDCA_AC_VO - ac))) {
 				/* APSD was formerly enabled on this AC but is no longer required */
 				/* so we must reassociate */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: On session %d reassoc needed "
 					  "to disable APSD on AC %d", __func__,
 					  __LINE__, sessionId, ac);
@@ -2785,14 +2785,14 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 								false);
 				if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
 					/* err msg */
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_ERROR,
 						  "%s: %d: Unable to request reassociation",
 						  __func__, __LINE__);
 					break;
 				} else {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-						  CDF_TRACE_LEVEL_INFO_HIGH,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+						  QDF_TRACE_LEVEL_INFO_HIGH,
 						  "%s: %d: On session %d reassociation to enable "
 						  "APSD on AC %d is pending",
 						  __func__, __LINE__, sessionId,
@@ -2804,8 +2804,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 			} else {
 				/* we don't need APSD on this AC */
 				/* and we don't currently have APSD on this AC */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: Request is not looking for APSD & Admission "
 					  "Control isn't mandatory for the AC",
 					  __func__, __LINE__);
@@ -2817,7 +2817,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 		} else if (!(pIes->WMMParams.qosInfo & SME_QOS_AP_SUPPORTS_APSD)
 			   && !(pIes->WMMInfoAp.uapsd)) {
 			/* application is looking for APSD but AP doesn't support it */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AP doesn't support APSD",
 				  __func__, __LINE__, sessionId);
 			break;
@@ -2826,7 +2826,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 			/* application is looking for APSD */
 			/* and it is already enabled on this AC */
 			status = SME_QOS_STATUS_SETUP_SUCCESS_APSD_SET_ALREADY;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Request is looking for APSD and it is already "
 				  "set for the AC", __func__, __LINE__);
 			break;
@@ -2834,8 +2834,8 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 			/* application is looking for APSD */
 			/* but it is not enabled on this AC */
 			/* so we need to reassociate */
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("On session %d reassoc needed to enable APSD on AC %d"),
 				sessionId, ac);
 			/* reassoc logic */
@@ -2853,14 +2853,14 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 						false);
 			if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
 				/* err msg */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-						CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+						QDF_TRACE_LEVEL_ERROR,
 						"%s: %d: Unable to request reassociation",
 						__func__, __LINE__);
 				break;
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_INFO_HIGH,
 					FL("On session %d reassociation to enable APSD on AC %d is pending"),
 					sessionId, ac);
 				status =
@@ -2883,7 +2883,7 @@ sme_QosStatusType sme_qos_setup(tpAniSirGlobal pMac,
 QDF_STATUS sme_qos_process_set_key_success_ind(tpAniSirGlobal pMac,
 					       uint8_t sessionId, void *pEvent_info)
 {
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 		  "########### Set Key Complete #############");
 	(void)sme_qos_process_buffered_cmd(sessionId);
 	return QDF_STATUS_SUCCESS;
@@ -2921,7 +2921,7 @@ QDF_STATUS sme_qos_ese_save_tspec_response(tpAniSirGlobal pMac, uint8_t sessionI
 	pAddtsRsp->rsp.dialogToken = 0;
 	pAddtsRsp->rsp.status = eSIR_SUCCESS;
 	pAddtsRsp->rsp.wmeTspecPresent = pTspec->present;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  "%s: Copy Tspec to local data structure ac=%d, tspecIdx=%d",
 		  __func__, ac, tspecIndex);
 
@@ -2963,7 +2963,7 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac,
 
 	pCsrSession = CSR_GET_SESSION(pMac, sessionId);
 	if (NULL == pCsrSession) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("session %d not found"), sessionId);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2983,13 +2983,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac,
 	/* should be atleast equal to the one TSPEC IE */
 	tspecIeLen = pCsrConnectedInfo->nTspecIeLength;
 	if (tspecIeLen < sizeof(tDot11fIEWMMTSPEC)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("ESE Tspec IE len %d less than min %zu"),
 			  tspecIeLen, sizeof(tDot11fIEWMMTSPEC));
 		return QDF_STATUS_E_FAILURE;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 		  "TspecLen = %d, pbFrames = %p, pTspecIE = %p",
 		  tspecIeLen, pCsrConnectedInfo->pbFrames, pTspecIE);
 
@@ -2997,13 +2997,13 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac,
 	for (cnt = 0; cnt < numTspec; cnt++) {
 		ac = sme_qos_up_to_ac(pTspecIE->user_priority);
 		if (ac >= SME_QOS_EDCA_AC_MAX) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("ac %d more than it`s max value"), ac);
 			return QDF_STATUS_E_FAILURE;
 		}
 		pACInfo = &pSession->ac_info[ac];
 		tspec_mask_status = pACInfo->tspec_mask_status;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  FL("UP=%d, ac=%d, tspec_mask_status=%x"),
 			  pTspecIE->user_priority, ac, tspec_mask_status);
 
@@ -3011,8 +3011,8 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac,
 		     tspec_flow_index < SME_QOS_TSPEC_INDEX_MAX;
 		     tspec_flow_index++) {
 			if (tspec_mask_status & (1 << tspec_flow_index)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_WARN,
 					  FL
 						  ("Found Tspec entry flow = %d AC = %d"),
 					  tspec_flow_index, ac);
@@ -3020,8 +3020,8 @@ QDF_STATUS sme_qos_ese_process_reassoc_tspec_rsp(tpAniSirGlobal pMac,
 								pTspecIE, ac,
 								tspec_flow_index);
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_WARN,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_WARN,
 					  FL
 						  ("Not found Tspec entry flow = %d AC = %d"),
 					  tspec_flow_index, ac);
@@ -3088,7 +3088,7 @@ static void sme_qos_copy_tspec_info(tpAniSirGlobal pMac,
 	pTspec->tsinfo.traffic.ackPolicy = pTspec_Info->ts_info.ack_policy;
 	pTspec->type = SME_QOS_TSPEC_IE_TYPE;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: up = %d, tid = %d",
 		  __func__, __LINE__,
 		  pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid);
@@ -3172,7 +3172,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac,
 	uint32_t nStatus;
 
 	if (pRICBuffer == NULL || pRICIdentifier == NULL || pRICLength == NULL) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -3217,7 +3217,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac,
 		dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE),
 					     pRICLength);
 	if (DOT11F_FAILED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Packing of RIC Data of length %d failed with status %d"),
 			  *pRICLength, nStatus);
@@ -3258,7 +3258,7 @@ QDF_STATUS sme_qos_create_tspec_ricie(tpAniSirGlobal pMac,
 		dot11f_pack_ie_ric_data_desc(pMac, &ricIE, pRICBuffer, sizeof(ricIE),
 					     pRICLength);
 	if (DOT11F_FAILED(nStatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL
 				  ("Packing of RIC Data of length %d failed with status %d"),
 			  *pRICLength, nStatus);
@@ -3286,7 +3286,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
 	sme_QosFlowInfoEntry *flow_info = NULL;
 	tListElem *entry = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		FL("Invoked on session %d"), sessionId);
 
 	session = &sme_qos_cb.sessionInfo[sessionId];
@@ -3306,8 +3306,8 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
 				&& !ac_info->tspec_pending)
 				|| (ac_info->
 				tspec_mask_status & (1 << tspec_index))) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_INFO,
 					FL("Copying the currentQos to "
 					"requestedQos for AC=%d, flow=%d"),
 					ac, tspec_index);
@@ -3332,12 +3332,12 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
 					SME_QOS_REQUESTED);
 				break;
 			default:
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					QDF_TRACE_LEVEL_ERROR,
 					FL("FT Reassoc req event in"
 					" unexpected state %d"),
 					ac_info->curr_state);
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 			}
 		}
 	}
@@ -3357,7 +3357,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
 	 */
 	entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!entry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			FL("Flow List empty, nothing to update"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -3365,7 +3365,7 @@ static QDF_STATUS sme_qos_process_ft_reassoc_req_ev(
 	do {
 		flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link);
 		if (sessionId == flow_info->sessionId) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				FL("Changing FlowID %d reason to SETUP"
 				"and HO renewal to false"),
 				flow_info->QosFlowID);
@@ -3397,7 +3397,7 @@ static void sme_qos_fill_aggr_info(int ac_id, int ts_id,
 				   tSirAggrQosReq *msg,
 				   sme_QosSessionInfo *session)
 {
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 		  FL("Found tspec entry AC=%d, flow=%d, direction = %d"),
 		  ac_id, ts_id, direction);
 
@@ -3447,7 +3447,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 	int i, j = 0;
 	uint8_t direction;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("invoked on session %d"), session_id);
 
 	session = &sme_qos_cb.sessionInfo[session_id];
@@ -3456,7 +3456,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 
 	if (!aggr_req) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("couldn't allocate memory for the msg buffer"));
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -3474,10 +3474,10 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 
 	for (i = 0; i < SME_QOS_EDCA_AC_MAX; i++) {
 		for (j = 0; j < SME_QOS_TSPEC_INDEX_MAX; j++) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("ac=%d, tspec_mask_staus=%x, tspec_index=%d"),
 				  i, session->ac_info[i].tspec_mask_status, j);
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("direction = %d"),
 				  session->ac_info[i].addTsRsp[j].rsp.tspec.
 				  tsinfo.traffic.direction);
@@ -3497,13 +3497,13 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 		}
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  FL("Sending aggregated message to HAL 0x%x"),
 		  aggr_req->aggrInfo.tspecIdx);
 
 	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) {
 		status = QDF_STATUS_SUCCESS;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("sent down a AGGR QoS req to PE"));
 	}
 
@@ -3585,7 +3585,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf)
 	int i, j = 0;
 	uint8_t sessionid = rsp->sessionId;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  FL("Received AGGR_QOS resp from LIM"));
 
 	/* Copy the updated response information for TSPEC of all the ACs */
@@ -3599,7 +3599,7 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf)
 				ac_info[i].addTsRsp[j].rsp.tspec.tsinfo.traffic.
 				direction;
 
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  FL("Addts rsp from LIM AC=%d, flow=%d dir=%d, tspecIdx=%x"),
 				  i, j, direction, rsp->aggrInfo.tspecIdx);
 
@@ -3617,8 +3617,8 @@ QDF_STATUS sme_qos_process_aggr_qos_rsp(tpAniSirGlobal mac_ctx, void *msgbuf)
 			addtsrsp.rsp.status = rsp->aggrInfo.aggrRsp[i].status;
 			addtsrsp.rsp.tspec = rsp->aggrInfo.aggrRsp[i].tspec;
 
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO,
 				  FL("Processing Addts rsp from LIM AC=%d, flow=%d"),
 				  i, j);
 			/* post ADD TS response for each */
@@ -3661,12 +3661,12 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx,
 			continue;
 
 		if (!*ric_rsplen) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("RIC Response not received for AC %d on "
 			  "TSPEC Index %d, RIC Req Identifier = %d"),
 			  ac, tspec_flow_index,
 			  ac_info->ricIdentifier[tspec_flow_index]);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			continue;
 		}
 		/* Now we got response for this identifier. Process it. */
@@ -3677,15 +3677,15 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx,
 
 		if (ric_data_desc->RICData.Identifier !=
 			ac_info->ricIdentifier[tspec_flow_index]) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("RIC response order not same as request sent. "
 			  "Request ID = %d, Response ID = %d"),
 			  ac_info->ricIdentifier[tspec_flow_index],
 			  ric_data_desc->RICData.Identifier);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME,
-			  CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+			  QDF_TRACE_LEVEL_INFO,
 			  FL("Processing RIC Response for AC %d, "
 			  "TSPEC Flow index %d with RIC ID %d "),
 			  ac, tspec_flow_index,
@@ -3694,8 +3694,8 @@ static QDF_STATUS sme_qos_find_matching_tspec(tpAniSirGlobal mac_ctx,
 					sessionid, ric_data_desc, ac,
 					tspec_flow_index);
 			if (QDF_STATUS_SUCCESS != status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_ERROR,
 				  FL("Failed with status %d for AC %d in "
 				  "TSPEC Flow index = %d"),
 				  status, ac, tspec_flow_index);
@@ -3749,8 +3749,8 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx,
 			ac1 = sme_qos_up_to_ac(
 				ric_data->WMMTSPEC.user_priority);
 			if (ac == SME_QOS_EDCA_AC_MAX) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_ERROR,
 				  FL("Invalid AC %d UP %d"), ac,
 				  ric_data->WMMTSPEC.user_priority);
 				break;
@@ -3762,8 +3762,8 @@ static QDF_STATUS sme_qos_find_matching_tspec_lfr3(tpAniSirGlobal mac_ctx,
 						sessionid, ric_data, ac,
 						tspec_flow_idx);
 				if (QDF_STATUS_SUCCESS != status) {
-					CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+					QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("Failed with status %d for AC %d "
 					  "in TSPEC Flow index = %d"),
 					  status, ac, tspec_flow_idx);
@@ -3800,14 +3800,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx,
 #endif
 
 	if (NULL == csr_session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("The Session pointer is NULL"));
 		return QDF_STATUS_E_FAILURE;
 	}
 	csr_conn_info = &csr_session->connectedInfo;
 	ric_rsplen = csr_conn_info->nRICRspLength;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("invoked on session %d"), sessionid);
 
 	qos_session = &sme_qos_cb.sessionInfo[sessionid];
@@ -3827,14 +3827,14 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx,
 		}
 
 		if (ric_rsplen) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("RIC Resp still follows . Rem len = %d"),
 				ric_rsplen);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("LFR3-11r Compare RIC in Reassoc Resp to find"
 			     " matching tspec in host."));
 		ric_data = ric_data_desc;
@@ -3848,7 +3848,7 @@ QDF_STATUS sme_qos_process_ft_reassoc_rsp_ev(tpAniSirGlobal mac_ctx,
 					ric_len);
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("LFR3-11r ric_rsplen is zero or ric_data_desc is"
 			  " not present or wmmtspec is not present"));
 		}
@@ -3887,12 +3887,12 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 	WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for AC %d",
 		  __func__, __LINE__, sessionId, ac);
 	if (sessionId >= CSR_ROAM_SESSION_MAX) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: sessionId(%d) is invalid",
 			  __func__, __LINE__, sessionId);
 		return QDF_STATUS_E_FAILURE;
@@ -3902,7 +3902,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 	pMsg = (tSirAddtsReq *) cdf_mem_malloc(sizeof(tSirAddtsReq));
 	if (!pMsg) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: couldn't allocate memory for the msg buffer",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_NOMEM;
@@ -3953,7 +3953,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 	pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE;
 	/*Fill the BSSID pMsg->req.bssId */
 	if (NULL == pSession->assocInfo.pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: BSS descriptor is NULL so we don't send request to PE",
 			  __func__, __LINE__);
 		cdf_mem_free(pMsg);
@@ -3962,7 +3962,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 	cdf_mem_copy(&pMsg->bssid.bytes[0],
 		     &pSession->assocInfo.pBssDesc->bssId[0],
 		     sizeof(struct qdf_mac_addr));
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: up = %d, tid = %d",
 		  __func__, __LINE__,
 		  pTspec_Info->ts_info.up, pTspec_Info->ts_info.tid);
@@ -3974,7 +3974,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 #endif
 	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) {
 		status = QDF_STATUS_SUCCESS;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: sent down a ADDTS req to PE",
 			  __func__, __LINE__);
 		/* event: EVENT_WLAN_QOS */
@@ -4013,13 +4013,13 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 	WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for AC %d",
 		  __func__, __LINE__, sessionId, ac);
 	pMsg = (tSirDeltsReq *) cdf_mem_malloc(sizeof(tSirDeltsReq));
 	if (!pMsg) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: couldn't allocate memory for the msg buffer",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_NOMEM;
@@ -4063,7 +4063,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 	pMsg->req.tspec.type = SME_QOS_TSPEC_IE_TYPE;
 	/*Fill the BSSID pMsg->req.bssId */
 	if (NULL == pSession->assocInfo.pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: BSS descriptor is NULL so we don't send request to PE",
 			  __func__, __LINE__);
 		cdf_mem_free(pMsg);
@@ -4073,7 +4073,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 		     &pSession->assocInfo.pBssDesc->bssId[0],
 		     sizeof(struct qdf_mac_addr));
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: up = %d, tid = %d",
 		  __func__, __LINE__,
 		  pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid);
@@ -4081,7 +4081,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 		     sizeof(sme_QosWmmTspecInfo));
 	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) {
 		status = QDF_STATUS_SUCCESS;
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE",
 			  __func__, __LINE__);
 		/* event: EVENT_WLAN_QOS */
@@ -4126,14 +4126,14 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
 
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for UP %d",
 		  __func__, __LINE__, sessionId, up);
 
 	ac = sme_qos_up_to_ac(up);
 	if (SME_QOS_EDCA_AC_MAX == ac) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: invalid AC %d from UP %d",
 			  __func__, __LINE__, ac, up);
 
@@ -4149,7 +4149,7 @@ QDF_STATUS sme_qos_process_add_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
 		return QDF_STATUS_SUCCESS;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked on session %d with return code %d",
 		  __func__, __LINE__, sessionId, paddts_rsp->rc);
 	/* our outstanding request has been serviced */
@@ -4191,7 +4191,7 @@ QDF_STATUS sme_qos_process_del_ts_rsp(tpAniSirGlobal pMac, void *pMsgBuf)
 	sme_QosSessionInfo *pSession;
 	uint8_t sessionId = pDeltsRsp->sessionId;
 	/* msg */
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked on session %d with return code %d",
 		  __func__, __LINE__, sessionId, pDeltsRsp->rc);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4229,13 +4229,13 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf)
 #ifdef FEATURE_WLAN_DIAG_SUPPORT
 	WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type);
 #endif
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked on session %d for UP %d",
 		  __func__, __LINE__, sessionId, up);
 	ac = sme_qos_up_to_ac(up);
 	if (SME_QOS_EDCA_AC_MAX == ac) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: invalid AC %d from UP %d",
 			  __func__, __LINE__, ac, up);
 		return QDF_STATUS_E_FAILURE;
@@ -4252,10 +4252,10 @@ QDF_STATUS sme_qos_process_del_ts_ind(tpAniSirGlobal pMac, void *pMsgBuf)
 	/* through the callback it registered per request */
 	if (!QDF_IS_STATUS_SUCCESS
 		    (sme_qos_find_all_in_flow_list(pMac, search_key, sme_qos_del_ts_ind_fnp))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: no match found for ac = %d", __func__,
 			  __LINE__, search_key.key.ac_type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 /* event: EVENT_WLAN_QOS */
@@ -4285,7 +4285,7 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio
 	sme_QosACInfo *pACInfo;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	sme_QosEdcaAcType ac = SME_QOS_EDCA_AC_BE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4300,14 +4300,14 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio
 		/* get the association info */
 		if (!pEvent_info) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: pEvent_info is NULL",
 				  __func__, __LINE__);
 			return status;
 		}
 		if (!((sme_QosAssocInfo *) pEvent_info)->pBssDesc) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: pBssDesc is NULL",
 				  __func__, __LINE__);
 			return status;
@@ -4317,21 +4317,21 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio
 			     (pMac, (struct qdf_mac_addr *) &pSession->assocInfo.pBssDesc->bssId,
 			     (struct qdf_mac_addr *) &(((sme_QosAssocInfo *) pEvent_info)->
 					     pBssDesc->bssId)))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: assoc with the same BSS, no update needed",
 				  __func__, __LINE__);
 		} else {
 			status = sme_qos_save_assoc_info(pSession, pEvent_info);
 		}
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: wrong state: BE %d, BK %d, VI %d, VO %d",
 			  __func__, __LINE__,
 			  pSession->ac_info[SME_QOS_EDCA_AC_BE].curr_state,
 			  pSession->ac_info[SME_QOS_EDCA_AC_BK].curr_state,
 			  pSession->ac_info[SME_QOS_EDCA_AC_VI].curr_state,
 			  pSession->ac_info[SME_QOS_EDCA_AC_VO].curr_state);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return status;
 	}
 	/* the session is active */
@@ -4355,12 +4355,12 @@ QDF_STATUS sme_qos_process_assoc_complete_ev(tpAniSirGlobal pMac, uint8_t sessio
 			case SME_QOS_HANDOFF:
 			case SME_QOS_CLOSED:
 			default:
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: On session %d AC %d is in wrong state %d",
 					  __func__, __LINE__, sessionId, ac,
 					  pACInfo->curr_state);
-				CDF_ASSERT(0);
+				QDF_ASSERT(0);
 				break;
 			}
 		}
@@ -4384,20 +4384,20 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 	sme_QosSessionInfo *pSession;
 	sme_QosACInfo *pACInfo;
 	sme_QosEdcaAcType ac;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 
 	if (pSession->ftHandoffInProgress) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: no need for state transition, should "
 			  "already be in handoff state", __func__, __LINE__);
 		if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 		sme_qos_process_ft_reassoc_req_ev(sessionId);
@@ -4405,7 +4405,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 	}
 
 	if (pSession->handoffRequested) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: no need for state transition, should "
 			  "already be in handoff state", __func__, __LINE__);
 
@@ -4413,7 +4413,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 		    (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 		/* buffer the existing flows to be renewed after handoff is done */
@@ -4424,7 +4424,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 	}
 /* TBH: Assuming both handoff algo & 11r willn't be enabled at the same time */
 	if (pSession->ftHandoffInProgress) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: no need for state transition, should "
 			  "already be in handoff state", __func__, __LINE__);
 
@@ -4432,7 +4432,7 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 		    (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 
@@ -4454,11 +4454,11 @@ QDF_STATUS sme_qos_process_reassoc_req_ev(tpAniSirGlobal pMac, uint8_t sessionId
 		case SME_QOS_CLOSED:
 		case SME_QOS_INIT:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AC %d is in wrong state %d",
 				  __func__, __LINE__,
 				  sessionId, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4547,10 +4547,10 @@ QDF_STATUS sme_qos_handle_handoff_state(tpAniSirGlobal mac_ctx,
 	status = sme_qos_find_all_in_flow_list(mac_ctx, search_key,
 			sme_qos_reassoc_success_ev_fnp);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("no match found for ac = %d"),
 			  search_key.key.ac_type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	ac_info->hoRenewal = false;
@@ -4582,11 +4582,11 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx,
 	sme_QosEdcaAcType ac;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("invoked on session %d"), sessionid);
 
 	if (CSR_ROAM_SESSION_MAX <= sessionid) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("invoked on session %d"), sessionid);
 		return status;
 	}
@@ -4602,19 +4602,19 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx,
 
 	/* get the association info */
 	if (!event_info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("event_info is NULL"));
 		return status;
 	}
 
 	if (!((sme_QosAssocInfo *) event_info)->pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("pBssDesc is NULL"));
 		return status;
 	}
 	status = sme_qos_save_assoc_info(qos_session, event_info);
 	if (status)
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("sme_qos_save_assoc_info() failed"));
 
 	/*
@@ -4670,10 +4670,10 @@ QDF_STATUS sme_qos_process_reassoc_success_ev(tpAniSirGlobal mac_ctx,
 		case SME_QOS_REQUESTED:
 		case SME_QOS_QOS_ON:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("session %d AC %d is in wrong state %d"),
 				  sessionid, ac, ac_info->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4697,7 +4697,7 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac,
 	sme_QosSessionInfo *pSession;
 	sme_QosACInfo *pACInfo;
 	sme_QosEdcaAcType ac;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4737,11 +4737,11 @@ QDF_STATUS sme_qos_process_reassoc_failure_ev(tpAniSirGlobal pMac,
 		case SME_QOS_REQUESTED:
 		case SME_QOS_QOS_ON:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AC %d is in wrong state %d",
 				  __func__, __LINE__,
 				  sessionId, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4766,7 +4766,7 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac,
 	sme_QosSessionInfo *pSession;
 	sme_QosACInfo *pACInfo;
 	uint8_t ac;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4781,8 +4781,8 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac,
 		case SME_QOS_HANDOFF:
 			/* print error msg */
 			if (pSession->ftHandoffInProgress) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: %d: SME_QOS_CSR_HANDOFF_ASSOC_REQ received in "
 					  "SME_QOS_HANDOFF state with FT in progress",
 					  __func__, __LINE__);
@@ -4792,11 +4792,11 @@ QDF_STATUS sme_qos_process_handoff_assoc_req_ev(tpAniSirGlobal pMac,
 		case SME_QOS_CLOSED:
 		case SME_QOS_INIT:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AC %d is in wrong state %d",
 				  __func__, __LINE__,
 				  sessionId, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4834,7 +4834,7 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac,
 	sme_QosACInfo *pACInfo;
 	uint8_t ac;
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4865,11 +4865,11 @@ QDF_STATUS sme_qos_process_handoff_success_ev(tpAniSirGlobal pMac,
    state may be SME_QOS_REQUESTED */
 			if (pSession->ftHandoffInProgress)
 				break;
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AC %d is in wrong state %d",
 				  __func__, __LINE__,
 				  sessionId, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4892,7 +4892,7 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac,
 	sme_QosSessionInfo *pSession;
 	sme_QosACInfo *pACInfo;
 	uint8_t ac;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4925,11 +4925,11 @@ QDF_STATUS sme_qos_process_handoff_failure_ev(tpAniSirGlobal pMac,
 		case SME_QOS_REQUESTED:
 		case SME_QOS_QOS_ON:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: On session %d AC %d is in wrong state %d",
 				  __func__, __LINE__,
 				  sessionId, ac, pACInfo->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -4958,7 +4958,7 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId,
 					 void *pEvent_info)
 {
 	sme_QosSessionInfo *pSession;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -4968,14 +4968,14 @@ QDF_STATUS sme_qos_process_disconnect_ev(tpAniSirGlobal pMac, uint8_t sessionId,
 	 */
 	if ((pSession->handoffRequested)
 	    && !pSession->ftHandoffInProgress) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: no need for state transition, should "
 			  "already be in handoff state", __func__, __LINE__);
 		if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[1].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_SUCCESS;
 		}
 
@@ -5019,12 +5019,12 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId,
 {
 	sme_QosSessionInfo *pSession;
 	sme_QosEdcaAcType ac;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 	if (pSession->handoffRequested) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: no need for state transition, should "
 			  "already be in handoff state", __func__, __LINE__);
 		if ((pSession->ac_info[0].curr_state != SME_QOS_HANDOFF) ||
@@ -5032,7 +5032,7 @@ QDF_STATUS sme_qos_process_join_req_ev(tpAniSirGlobal pMac, uint8_t sessionId,
 		    (pSession->ac_info[2].curr_state != SME_QOS_HANDOFF) ||
 		    (pSession->ac_info[3].curr_state != SME_QOS_HANDOFF)) {
 			/* just print */
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 		}
 		/* buffer the existing flows to be renewed after handoff is done */
 		sme_qos_buffer_existing_flows(pMac, sessionId);
@@ -5077,11 +5077,11 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx,
 	uint8_t tspec_mask_status = 0;
 	uint8_t tspec_pending_status = 0;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("invoked on SME session %d"), sessionid);
 
 	if (NULL == sme_session) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("sme_session is NULL"));
 		return QDF_STATUS_E_INVAL;
 	}
@@ -5102,10 +5102,10 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx,
 		case SME_QOS_CLOSED:
 		case SME_QOS_INIT:
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Session %d AC %d is in wrong state %d"),
 				  sessionid, ac, ac_info->curr_state);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	}
@@ -5118,7 +5118,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx,
 
 	/* Data is accessed from saved PreAuth Rsp */
 	if (NULL == sme_session->ftSmeContext.psavedFTPreAuthRsp) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("psavedFTPreAuthRsp is NULL"));
 		return QDF_STATUS_E_INVAL;
 	}
@@ -5144,7 +5144,7 @@ QDF_STATUS sme_qos_process_preauth_success_ind(tpAniSirGlobal mac_ctx,
 		tspec_pending_status = ac_info->tspec_pending;
 		tspec_mask_status = ac_info->tspec_mask_status;
 		cdf_mem_zero(ac_info->ricIdentifier, SME_QOS_TSPEC_INDEX_MAX);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  FL("AC %d ==> TSPEC status = %d, tspec pending = %d"),
 			  ac, tspec_mask_status, tspec_pending_status);
 
@@ -5206,13 +5206,13 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac,
 	uint8_t tspec_pending;
 	sme_QosWmmUpType up =
 		(sme_QosWmmUpType) pRsp->tspec.tsinfo.traffic.userPrio;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for UP %d", __func__, __LINE__,
 		  sessionId, up);
 	ac = sme_qos_up_to_ac(up);
 	if (SME_QOS_EDCA_AC_MAX == ac) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: invalid AC %d from UP %d",
 			  __func__, __LINE__, ac, up);
 		return QDF_STATUS_E_FAILURE;
@@ -5222,10 +5222,10 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac,
 	/* is there a TSPEC request pending on this AC? */
 	tspec_pending = pACInfo->tspec_pending;
 	if (!tspec_pending) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d an AddTS is not pending on AC %d",
 			  __func__, __LINE__, sessionId, ac);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -5237,11 +5237,11 @@ QDF_STATUS sme_qos_process_add_ts_failure_rsp(tpAniSirGlobal pMac,
 	if (!QDF_IS_STATUS_SUCCESS
 		    (sme_qos_find_all_in_flow_list
 			    (pMac, search_key, sme_qos_add_ts_failure_fnp))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d no match found for ac = %d",
 			  __func__, __LINE__, sessionId,
 			  search_key.key.ac_type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	cdf_mem_zero(&pACInfo->requested_QoSInfo[tspec_pending - 1],
@@ -5281,7 +5281,7 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid,
 	sme_QosSessionInfo *qos_session;
 	sme_QosACInfo *ac_info;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("invoked on session %d for AC %d TSPEC %d"),
 		  sessionid, search_key.key.ac_type, new_tspec_mask);
 
@@ -5290,15 +5290,15 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid,
 	if (search_key.key.ac_type < SME_QOS_EDCA_AC_MAX) {
 		ac_info = &qos_session->ac_info[search_key.key.ac_type];
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Exceeded the array bounds"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!list_elt) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Flow List empty, nothing to update"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -5317,8 +5317,8 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid,
 			if ((search_key.key.ac_type == flow_info->ac_type) &&
 			    (search_key.direction ==
 				flow_info->QoSInfo.ts_info.direction)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("Flow %d matches"), flow_info->QosFlowID);
 				ac_info->num_flows[flow_info->tspec_mask - 1]--;
 				ac_info->num_flows[new_tspec_mask - 1]++;
@@ -5327,8 +5327,8 @@ static QDF_STATUS sme_qos_update_tspec_mask(uint8_t sessionid,
 		} else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_5) {
 			if ((search_key.key.ac_type == flow_info->ac_type) &&
 			    (search_key.tspec_mask == flow_info->tspec_mask)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("Flow %d matches"), flow_info->QosFlowID);
 				ac_info->num_flows[flow_info->tspec_mask - 1]--;
 				ac_info->num_flows[new_tspec_mask - 1]++;
@@ -5374,14 +5374,14 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
 	WLAN_HOST_DIAG_EVENT_DEF(qos, host_event_wlan_qos_payload_type);
 	host_log_qos_tspec_pkt_type *log_ptr = NULL;
 #endif /* FEATURE_WLAN_DIAG_SUPPORT */
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for UP %d",
 		  __func__, __LINE__, sessionId, up);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 	ac = sme_qos_up_to_ac(up);
 	if (SME_QOS_EDCA_AC_MAX == ac) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: invalid AC %d from UP %d",
 			  __func__, __LINE__, ac, up);
 		return QDF_STATUS_E_FAILURE;
@@ -5390,7 +5390,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
 	/* is there a TSPEC request pending on this AC? */
 	tspec_pending = pACInfo->tspec_pending;
 	if (!tspec_pending) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d an AddTS is not pending on AC %d",
 			  __func__, __LINE__, sessionId, ac);
 		return QDF_STATUS_E_FAILURE;
@@ -5412,10 +5412,10 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
 					~(1 << (SME_QOS_EDCA_AC_VO - ac));
 			}
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Exceeded the array bounds of pACInfo->requested_QosInfo",
 				  __func__, __LINE__);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			return QDF_STATUS_E_FAILURE;
 		}
 	}
@@ -5464,7 +5464,7 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
 	pACInfo->curr_QoSInfo[tspec_pending - 1].medium_time =
 		pRsp->tspec.mediumTime;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: On session %d AddTspec Medium Time %d",
 		  __func__, __LINE__, sessionId, pRsp->tspec.mediumTime);
 
@@ -5510,11 +5510,11 @@ QDF_STATUS sme_qos_process_add_ts_success_rsp(tpAniSirGlobal pMac,
 	if (!QDF_IS_STATUS_SUCCESS
 		    (sme_qos_find_all_in_flow_list
 			    (pMac, search_key, sme_qos_add_ts_success_fnp))) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d no match found for ac %d",
 			  __func__, __LINE__, sessionId,
 			  search_key.key.ac_type);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	pACInfo->hoRenewal = false;
@@ -5609,16 +5609,16 @@ QDF_STATUS sme_qos_aggregate_params(sme_QosWmmTspecInfo *pInput_Tspec_Info,
 				    sme_QosWmmTspecInfo *pUpdated_Tspec_Info)
 {
 	sme_QosWmmTspecInfo TspecInfo;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked", __func__, __LINE__);
 	if (!pInput_Tspec_Info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: input is NULL, nothing to aggregate",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (!pCurrent_Tspec_Info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Current is NULL, can't aggregate",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -5788,11 +5788,11 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId,
 	sme_QosACInfo *pACInfo;
 	sme_QosFlowInfoEntry *flow_info = NULL;
 	sme_QosWmmTspecInfo Tspec_Info;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: invoked on session %d for AC %d TSPEC %d",
 		  __func__, __LINE__, sessionId, ac, tspec_mask);
 	if (!pTspec_Info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: output is NULL, can't aggregate",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -5800,7 +5800,7 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId,
 	cdf_mem_zero(&Tspec_Info, sizeof(sme_QosWmmTspecInfo));
 	pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Flow List empty, nothing to update",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -5820,15 +5820,15 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId,
 		if ((sessionId == flow_info->sessionId) &&
 		    (ac == flow_info->ac_type) &&
 		    (tspec_mask == flow_info->tspec_mask)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Flow %d matches",
 				  __func__, __LINE__, flow_info->QosFlowID);
 
 			if ((SME_QOS_REASON_RELEASE == flow_info->reason) ||
 			    (SME_QOS_REASON_MODIFY == flow_info->reason)) {
 				/* msg */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  "%s: %d: Skipping Flow %d as it is marked "
 					  "for release/modify", __func__,
 					  __LINE__, flow_info->QosFlowID);
@@ -5837,8 +5837,8 @@ static QDF_STATUS sme_qos_update_params(uint8_t sessionId,
 				    (sme_qos_aggregate_params
 					    (&flow_info->QoSInfo, &Tspec_Info, NULL))) {
 				/* err msg */
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: sme_qos_aggregate_params() failed",
 					  __func__, __LINE__);
 			}
@@ -5866,7 +5866,7 @@ sme_QosWmmUpType sme_qos_ac_to_up(sme_QosEdcaAcType ac)
 	if (ac >= 0 && ac < SME_QOS_EDCA_AC_MAX) {
 		up = sme_qos_a_cto_up_map[ac];
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 		  "%s: %d: ac = %d up = %d returned",
 		  __func__, __LINE__, ac, up);
 	return up;
@@ -5886,7 +5886,7 @@ sme_QosEdcaAcType sme_qos_up_to_ac(sme_QosWmmUpType up)
 	if (up >= 0 && up < SME_QOS_WMM_UP_MAX) {
 		ac = sme_qos_u_pto_ac_map[up];
 	}
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 		  "%s: %d: up = %d ac = %d returned",
 		  __func__, __LINE__, up, ac);
 	return ac;
@@ -5914,7 +5914,7 @@ static void sme_qos_state_transition(uint8_t sessionId,
 	pACInfo = &pSession->ac_info[ac];
 	pACInfo->prev_state = pACInfo->curr_state;
 	pACInfo->curr_state = new_state;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: On session %d new state=%d, old state=%d, for AC=%d",
 		  __func__, __LINE__,
 		  sessionId, pACInfo->curr_state, pACInfo->prev_state, ac);
@@ -5940,7 +5940,7 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key)
 
 	list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!list_elt) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Flow List empty, can't search"));
 		return NULL;
 	}
@@ -5958,22 +5958,22 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key)
 
 		if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) {
 			if (search_key.key.QosFlowID == flow_info->QosFlowID) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("match found on flowID, ending search"));
 				break;
 			}
 		} else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) {
 			if (search_key.key.ac_type == flow_info->ac_type) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("match found on ac, ending search"));
 				break;
 			}
 		} else if (search_key.index & SME_QOS_SEARCH_KEY_INDEX_3) {
 			if (search_key.key.reason == flow_info->reason) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("match found on reason, ending search"));
 				break;
 			}
@@ -5981,8 +5981,8 @@ tListElem *sme_qos_find_in_flow_list(sme_QosSearchInfo search_key)
 			if ((search_key.key.ac_type == flow_info->ac_type) &&
 			    (search_key.direction ==
 				flow_info->QoSInfo.ts_info.direction)) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  FL("match found on reason, ending search"));
 				break;
 			}
@@ -6019,7 +6019,7 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx,
 
 	list_elt = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!list_elt) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Flow List empty, can't search"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6037,26 +6037,26 @@ QDF_STATUS sme_qos_find_all_in_flow_list(tpAniSirGlobal mac_ctx,
 
 		if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_1) &&
 		    (search_key.key.QosFlowID == flow_info->QosFlowID)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			    FL("match found on flowID, ending search"));
 			status = fnp(mac_ctx, list_elt);
 			if (QDF_STATUS_E_FAILURE == status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				    CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				    QDF_TRACE_LEVEL_ERROR,
 				    FL("Failed to process entry"));
 				break;
 			}
 		} else if ((search_key.index & SME_QOS_SEARCH_KEY_INDEX_2) &&
 			   (search_key.key.ac_type == flow_info->ac_type)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			    FL("match found on ac, ending search"));
 			ac_type = flow_info->ac_type;
 			flow_info->hoRenewal =
 				qos_session->ac_info[ac_type].hoRenewal;
 			status = fnp(mac_ctx, list_elt);
 			if (QDF_STATUS_E_FAILURE == status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-				    CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+				    QDF_TRACE_LEVEL_ERROR,
 				    FL("Failed to process entry"));
 				break;
 			}
@@ -6082,7 +6082,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
 	bool ret_val = false;
 	tDot11fBeaconIEs *pIesLocal;
 	if (!pSirBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: pSirBssDesc is NULL", __func__, __LINE__);
 		return false;
 	}
@@ -6096,7 +6096,7 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
 			    (csr_get_parsed_bss_description_ies
 				    (pMac, pSirBssDesc, &pIesLocal))) {
 			/* err msg */
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: csr_get_parsed_bss_description_ies() failed",
 				  __func__, __LINE__);
 			return false;
@@ -6124,15 +6124,15 @@ bool sme_qos_is_acm(tpAniSirGlobal pMac, tSirBssDescription *pSirBssDesc,
 				ret_val = true;
 			break;
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: unknown AC = %d",
 				  __func__, __LINE__, ac);
 			/* Assert */
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 	} /* IS_QOS_BSS */
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: ACM = %d for AC = %d",
 		  __func__, __LINE__, ret_val, ac);
 	if (NULL == pIes) {
@@ -6163,7 +6163,7 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx,
 
 	list_entry = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!list_entry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Flow List empty, nothing to buffer"));
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6198,14 +6198,14 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx,
 
 			if (!QDF_IS_STATUS_SUCCESS
 				    (sme_qos_buffer_cmd(&cmd, true)))
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("couldn't buffer the setup request"
 					  " for flow %d in handoff state"),
 					  flow_info->QosFlowID);
 			else
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  FL("buffered a setup request for "
 					  "flow %d in handoff state"),
 					  flow_info->QosFlowID);
@@ -6216,14 +6216,14 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx,
 			cmd.u.releaseCmdInfo.QosFlowID = flow_info->QosFlowID;
 			if (!QDF_IS_STATUS_SUCCESS
 				    (sme_qos_buffer_cmd(&cmd, true)))
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("couldn't buffer the release req"
 					  " for flow %d in handoff state"),
 					  flow_info->QosFlowID);
 			else
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  FL("buffered a release request for "
 					  "flow %d in handoff state"),
 					  flow_info->QosFlowID);
@@ -6236,20 +6236,20 @@ static QDF_STATUS sme_qos_buffer_existing_flows(tpAniSirGlobal mac_ctx,
 			cmd.u.modifyCmdInfo.QoSInfo = flow_info->QoSInfo;
 			if (!QDF_IS_STATUS_SUCCESS
 				    (sme_qos_buffer_cmd(&cmd, true)))
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("couldn't buffer the modify req"
 					  " for flow %d in handoff state"),
 					  flow_info->QosFlowID);
 			else
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_INFO_HIGH,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_INFO_HIGH,
 					  FL("buffered a modify request for "
 					  "flow %d in handoff state"),
 					  flow_info->QosFlowID);
 		}
 		/* delete the entry from Flow List */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("Deleting original entry at %p with flowID %d"),
 			  flow_info, flow_info->QosFlowID);
 		csr_ll_remove_entry(&sme_qos_cb.flow_list, list_entry, true);
@@ -6278,7 +6278,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac,
 	sme_QosFlowInfoEntry *flow_info = NULL;
 	pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, true);
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  "%s: %d: Flow List empty, nothing to delete",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -6297,7 +6297,7 @@ static QDF_STATUS sme_qos_delete_existing_flows(tpAniSirGlobal pMac,
 						       SME_QOS_STATUS_RELEASE_QOS_LOST_IND,
 						       flow_info->QosFlowID);
 			}
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: %d: Deleting entry at %p with flowID %d",
 				  __func__, __LINE__,
 				  flow_info, flow_info->QosFlowID);
@@ -6326,13 +6326,13 @@ QDF_STATUS sme_qos_buffer_cmd(sme_QosCmdInfo *pcmd, bool insert_head)
 {
 	sme_QosSessionInfo *pSession;
 	sme_QosCmdInfoEntry *pentry = NULL;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked", __func__, __LINE__);
 	pentry =
 		(sme_QosCmdInfoEntry *) cdf_mem_malloc(sizeof(sme_QosCmdInfoEntry));
 	if (!pentry) {
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Memory allocation failure",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_NOMEM;
@@ -6369,14 +6369,14 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 	QDF_STATUS cdf_ret_status = QDF_STATUS_SUCCESS;
 	sme_QosCmdInfo *qos_cmd = NULL;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL("Invoked on session %d"), session_id);
 	qos_session = &sme_qos_cb.sessionInfo[session_id];
 	if (!csr_ll_is_list_empty(&qos_session->bufferedCommandList, false)) {
 		list_elt = csr_ll_remove_head(&qos_session->bufferedCommandList,
 					      true);
 		if (!list_elt) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("no more buffered commands on session %d"),
 				  session_id);
 			qos_session->readyForPowerSave = true;
@@ -6395,8 +6395,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 				       qos_cmd->u.setupCmdInfo.QosFlowID,
 				       true, qos_cmd->u.setupCmdInfo.hoRenewal);
 			if (SME_QOS_STATUS_SETUP_FAILURE_RSP == hdd_status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_setup_req failed on session %d"),
 					  session_id);
 				cdf_ret_status = QDF_STATUS_E_FAILURE;
@@ -6407,8 +6407,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					qos_cmd->u.releaseCmdInfo.QosFlowID,
 					true);
 			if (SME_QOS_STATUS_RELEASE_FAILURE_RSP == hdd_status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_release_req failed on session %d"),
 					  session_id);
 				cdf_ret_status = QDF_STATUS_E_FAILURE;
@@ -6421,8 +6421,8 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					true);
 			if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP ==
 				hdd_status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_internal_modify_req failed on session %d"),
 					  session_id);
 				cdf_ret_status = QDF_STATUS_E_FAILURE;
@@ -6436,24 +6436,24 @@ static QDF_STATUS sme_qos_process_buffered_cmd(uint8_t session_id)
 					qos_cmd->u.resendCmdInfo.tspecMask);
 			if (SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP ==
 				hdd_status) {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  FL("sme_qos_re_request_add_ts failed on session %d"),
 					  session_id);
 				cdf_ret_status = QDF_STATUS_E_FAILURE;
 			}
 			break;
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("On session %d unknown cmd = %d"),
 				  session_id, qos_cmd->command);
-			CDF_ASSERT(0);
+			QDF_ASSERT(0);
 			break;
 		}
 		/* buffered command has been processed, reclaim the memory */
 		cdf_mem_free(pcmd);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("cmd buffer empty"));
 		qos_session->readyForPowerSave = true;
 	}
@@ -6475,13 +6475,13 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac,
 	sme_QosSessionInfo *pSession;
 	sme_QosCmdInfoEntry *pcmd = NULL;
 	tListElem *pEntry = NULL, *pNextEntry = NULL;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked on session %d",
 		  __func__, __LINE__, sessionId);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 	pEntry = csr_ll_peek_head(&pSession->bufferedCommandList, true);
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_WARN,
 			  "%s: %d: Buffered List empty, nothing to delete on session %d",
 			  __func__, __LINE__, sessionId);
 		return QDF_STATUS_E_FAILURE;
@@ -6489,7 +6489,7 @@ static QDF_STATUS sme_qos_delete_buffered_requests(tpAniSirGlobal pMac,
 	while (pEntry) {
 		pNextEntry =
 			csr_ll_next(&pSession->bufferedCommandList, pEntry, true);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 			  "%s: %d: deleting entry from buffered List", __func__,
 			  __LINE__);
 		/* delete the entry from Flow List */
@@ -6522,7 +6522,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession,
 	tSirBssDescription *pBssDesc = NULL;
 	uint32_t bssLen = 0;
 	if (NULL == pAssoc_info) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: pAssoc_info is NULL", __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6536,7 +6536,7 @@ QDF_STATUS sme_qos_save_assoc_info(sme_QosSessionInfo *pSession,
 	/* save the bss Descriptor */
 	pBssDesc = (tSirBssDescription *) cdf_mem_malloc(bssLen);
 	if (!pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: couldn't allocate memory for the bss Descriptor",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_NOMEM;
@@ -6570,9 +6570,9 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 	sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND;
 	sme_QosEdcaAcType ac;
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@@ -6585,7 +6585,7 @@ QDF_STATUS sme_qos_setup_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 				       &pACInfo->curr_QoSInfo[flow_info->
 							      tspec_mask - 1],
 				       hdd_status, flow_info->QosFlowID);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Entry with flowID = %d getting notified",
 			  __func__, __LINE__, flow_info->QosFlowID);
 	}
@@ -6611,9 +6611,9 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr
 	sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_MODIFIED_IND;
 	sme_QosEdcaAcType ac;
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@@ -6626,7 +6626,7 @@ QDF_STATUS sme_qos_modification_notify_fnp(tpAniSirGlobal pMac, tListElem *pEntr
 				       &pACInfo->curr_QoSInfo[flow_info->
 							      tspec_mask - 1],
 				       hdd_status, flow_info->QosFlowID);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Entry with flowID = %d getting notified",
 			  __func__, __LINE__, flow_info->QosFlowID);
 	}
@@ -6648,9 +6648,9 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 {
 	sme_QosFlowInfoEntry *flow_info = NULL;
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@@ -6661,7 +6661,7 @@ QDF_STATUS sme_qos_modify_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 		break;
 	case SME_QOS_REASON_MODIFY:
 		/* delete the original entry from Flow List */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Deleting original entry at %p with flowID %d",
 			  __func__, __LINE__, flow_info, flow_info->QosFlowID);
 		csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true);
@@ -6696,9 +6696,9 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 	sme_QosStatusType status;
 
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* delete the entry from Flow List */
@@ -6710,7 +6710,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 
 	lock_status = sme_acquire_global_lock(&pMac->sme);
 	if (!QDF_IS_STATUS_SUCCESS(lock_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Unable to obtain lock", __func__, __LINE__);
 		return SME_QOS_STATUS_RELEASE_FAILURE_RSP;
 	}
@@ -6718,7 +6718,7 @@ QDF_STATUS sme_qos_del_ts_ind_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 	status =
 		sme_qos_internal_release_req(pMac, flow_info->QosFlowID, false);
 	sme_release_global_lock(&pMac->sme);
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: QoS Release return status on Flow %d is %d",
 		  __func__, __LINE__, flow_info->QosFlowID, status);
 
@@ -6749,9 +6749,9 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx,
 	sme_QosEdcaAcType ac;
 	QDF_STATUS pmc_status = QDF_STATUS_E_FAILURE;
 	if (!entry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			"%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link);
@@ -6843,7 +6843,7 @@ sme_qos_reassoc_success_ev_fnp(tpAniSirGlobal mac_ctx,
 		}
 	} else {
 		/* delete the entry from Flow List */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Deleting entry at %p with flowID %d"),
 			flow_info, flow_info->QosFlowID);
 		csr_ll_remove_entry(&sme_qos_cb.flow_list, entry, true);
@@ -6880,9 +6880,9 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 	sme_QosStatusType hdd_status = SME_QOS_STATUS_SETUP_FAILURE_RSP;
 	sme_QosEdcaAcType ac;
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Entry is NULL", __func__, __LINE__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(pEntry, sme_QosFlowInfoEntry, link);
@@ -6930,7 +6930,7 @@ QDF_STATUS sme_qos_add_ts_failure_fnp(tpAniSirGlobal pMac, tListElem *pEntry)
 					       flow_info->QosFlowID);
 		}
 		/* delete the entry from Flow List */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Deleting entry at %p with flowID %d",
 			  __func__, __LINE__, flow_info, flow_info->QosFlowID);
 		csr_ll_remove_entry(&sme_qos_cb.flow_list, pEntry, true);
@@ -6977,9 +6977,9 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx,
 	uint8_t tspec_index;
 
 	if (!entry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Entry is NULL"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	flow_info = GET_BASE_ADDR(entry, sme_QosFlowInfoEntry, link);
@@ -6988,7 +6988,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx,
 	ac_info = &qos_session->ac_info[ac];
 	tspec_index = ac_info->tspec_pending - 1;
 	if (flow_info->tspec_mask != ac_info->tspec_pending) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL(" No need to notify the HDD, the ADDTS "
 			"success is not for index = %d of the AC = %d"),
 			flow_info->tspec_mask, ac);
@@ -7110,7 +7110,7 @@ QDF_STATUS sme_qos_add_ts_success_fnp(tpAniSirGlobal mac_ctx,
 		}
 	}
 	if (delete_entry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("Deleting entry at %p with flowID %d"),
 			flow_info, flow_info->QosFlowID);
 		/* delete the entry from Flow List */
@@ -7168,7 +7168,7 @@ void sme_qos_update_hand_off(uint8_t sessionId, bool updateHandOff)
 {
 	sme_QosSessionInfo *pSession;
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_MED,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_MED,
 		  "%s: %d: handoffRequested %d updateHandOff %d",
 		  __func__, __LINE__, pSession->handoffRequested,
 		  updateHandOff);
@@ -7242,7 +7242,7 @@ QDF_STATUS sme_offload_qos_process_out_of_uapsd_mode(tpAniSirGlobal pMac,
 
 	pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: Flow List empty, can't search",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -7277,7 +7277,7 @@ QDF_STATUS sme_offload_qos_process_into_uapsd_mode(tpAniSirGlobal pMac,
 
 	pEntry = csr_ll_peek_head(&sme_qos_cb.flow_list, false);
 	if (!pEntry) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Flow List empty, can't search",
 			  __func__, __LINE__);
 		return QDF_STATUS_E_FAILURE;
@@ -7348,7 +7348,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac,
 	sme_QosSessionInfo *pSession;
 	QDF_STATUS hstatus;
 	if (!CSR_IS_SESSION_VALID(pMac, sessionId)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session Id %d is invalid",
 			  __func__, __LINE__, sessionId);
 		return false;
@@ -7357,14 +7357,14 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac,
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
 
 	if (!pSession->sessionActive) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session %d is inactive",
 			  __func__, __LINE__, sessionId);
 		return false;
 	}
 
 	if (!pSession->assocInfo.pBssDesc) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: Session %d has an Invalid BSS Descriptor",
 			  __func__, __LINE__, sessionId);
 		return false;
@@ -7374,7 +7374,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac,
 						      pSession->assocInfo.pBssDesc,
 						      &pIes);
 	if (!QDF_IS_STATUS_SUCCESS(hstatus)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d unable to parse BSS IEs",
 			  __func__, __LINE__, sessionId);
 		return false;
@@ -7385,7 +7385,7 @@ bool sme_qos_is_ts_info_ack_policy_valid(tpAniSirGlobal pMac,
 	if (!pIes->HTCaps.present &&
 	    pQoSInfo->ts_info.ack_policy ==
 	    SME_QOS_WMM_TS_ACK_POLICY_HT_IMMEDIATE_BLOCK_ACK) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "%s: %d: On session %d HT Caps aren't present but application set ack policy to HT ",
 			  __func__, __LINE__, sessionId);
 
@@ -7424,7 +7424,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId,
 	do {
 		pCommand = sme_get_command_buffer(pMac);
 		if (!pCommand) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: fail to get command buffer for command %d",
 				  __func__, __LINE__, cmdType);
 			break;
@@ -7438,8 +7438,8 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId,
 				pCommand->u.qosCmd.tspecInfo = *pQoSInfo;
 				pCommand->u.qosCmd.ac = ac;
 			} else {
-				CDF_TRACE(QDF_MODULE_ID_SME,
-					  CDF_TRACE_LEVEL_ERROR,
+				QDF_TRACE(QDF_MODULE_ID_SME,
+					  QDF_TRACE_LEVEL_ERROR,
 					  "%s: %d: NULL pointer passed",
 					  __func__, __LINE__);
 				status = QDF_STATUS_E_INVAL;
@@ -7451,7 +7451,7 @@ static QDF_STATUS qos_issue_command(tpAniSirGlobal pMac, uint8_t sessionId,
 			pCommand->u.qosCmd.tspec_mask = tspec_mask;
 			break;
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: invalid command type %d",
 				  __func__, __LINE__, cmdType);
 			status = QDF_STATUS_E_INVAL;
@@ -7492,7 +7492,7 @@ bool qos_process_command(tpAniSirGlobal pMac, tSmeCmd *pCommand)
 			}
 			break;
 		default:
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  "%s: %d: invalid command type %d",
 				  __func__, __LINE__, pCommand->command);
 			break;
@@ -7524,7 +7524,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 	sme_QosStatusType status = SME_QOS_STATUS_MODIFY_SETUP_FAILURE_RSP;
 	sme_QosCmdInfo cmd;
 
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		FL(" Invoked on session %d for AC %d TSPEC %d"),
 		session_id, ac, tspec_mask);
 	session = &sme_qos_cb.sessionInfo[session_id];
@@ -7541,7 +7541,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 	 * followed by Reassoc.
 	 */
 	if (sme_qos_is_rsp_pending(session_id, ac)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL(" On session %d buffering the AddTS request "
 			"for AC %d in state %d as Addts is pending "
 			"on other AC or waiting for full power"),
@@ -7555,8 +7555,8 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 		cmd.u.resendCmdInfo.tspecMask = tspec_mask;
 		cmd.u.resendCmdInfo.QoSInfo = *qos_info;
 		if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) {
-			CDF_TRACE(QDF_MODULE_ID_SME,
-				CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME,
+				QDF_TRACE_LEVEL_ERROR,
 				FL("On session %d unable to buffer the AddTS "
 				"request for AC %d TSPEC %d in state %d"),
 				session_id, ac, tspec_mask,
@@ -7576,9 +7576,9 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 		/* if ACM, send out a new ADDTS */
 		ac_info->hoRenewal = true;
 		status = sme_qos_setup(mac_ctx, session_id, qos_info, ac);
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("sme_qos_setup returned in SME_QOS_QOS_ON state"));
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			FL("sme_qos_setup AC %d with status =%d"), ac, status);
 		if (SME_QOS_STATUS_SETUP_REQ_PENDING_RSP != status) {
 			/* we aren't waiting for a response from the AP */
@@ -7594,11 +7594,11 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 			status) ||
 			(SME_QOS_STATUS_SETUP_SUCCESS_IND_APSD_PENDING ==
 			status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("UAPSD is setup already status = %d "),
 				status);
 		} else {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL("sme_qos_setup return status = %d "),
 				status);
 		}
@@ -7606,7 +7606,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 	break;
 	case SME_QOS_HANDOFF:
 	case SME_QOS_REQUESTED:
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("Re-Add request in state = %d  buffer the request"),
 			ac_info->curr_state);
 		cmd.command = SME_QOS_RESEND_REQ;
@@ -7616,7 +7616,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 		cmd.u.resendCmdInfo.tspecMask = tspec_mask;
 		cmd.u.resendCmdInfo.QoSInfo = *qos_info;
 		if (!QDF_IS_STATUS_SUCCESS(sme_qos_buffer_cmd(&cmd, false))) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				FL(" couldn't buf the read request state = %d"),
 				ac_info->curr_state);
 			/* unable to buffer the request
@@ -7631,7 +7631,7 @@ sme_QosStatusType sme_qos_re_request_add_ts(tpAniSirGlobal mac_ctx,
 	case SME_QOS_LINK_UP:
 	default:
 		/* print error msg, */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			FL("ReAdd request in unexpected state = %d"),
 			ac_info->curr_state);
 		/* unable to service the request
@@ -7666,7 +7666,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId
 	sme_QosSessionInfo *pSession;
 	sme_QosACInfo *pACInfo;
 	QDF_STATUS status;
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  "%s: %d: Invoked on session %d with UAPSD mask 0x%X",
 		  __func__, __LINE__, sessionId, pModFields->uapsd_mask);
 	pSession = &sme_qos_cb.sessionInfo[sessionId];
@@ -7678,7 +7678,7 @@ static QDF_STATUS sme_qos_request_reassoc(tpAniSirGlobal pMac, uint8_t sessionId
 		sme_QosEdcaAcType ac;
 		for (ac = SME_QOS_EDCA_AC_BE; ac < SME_QOS_EDCA_AC_MAX; ac++) {
 			pACInfo = &pSession->ac_info[ac];
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 				  "%s: %d: AC[%d] is in state [%d]",
 				  __func__, __LINE__, ac, pACInfo->curr_state);
 			/* If it is already in HANDOFF state, don't do anything since we */
@@ -7700,7 +7700,7 @@ static uint32_t sme_qos_assign_flow_id(void)
 	if (SME_QOS_MAX_FLOW_ID == flowId) {
 		/* The Flow ID wrapped.  This is obviously not a real life scenario */
 		/* but handle it to keep the software test folks happy */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  "%s: %d: Software Test made the flow counter wrap, "
 			  "QoS may no longer be functional",
 			  __func__, __LINE__);
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index b827c68cfe78..31728178ef34 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.c
@@ -1030,12 +1030,12 @@ rrm_calculate_neighbor_ap_roam_score(tpAniSirGlobal mac_ctx,
 	uint8_t session_id;
 #endif
 	if (NULL == nbr_report_desc) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
 	if (NULL == nbr_report_desc->pNeighborBssDescription) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -1112,11 +1112,11 @@ void rrm_store_neighbor_rpt_by_roam_score(tpAniSirGlobal pMac,
 	tRrmNeighborReportDesc *pTempNeighborReportDesc;
 
 	if (NULL == pNeighborReportDesc) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 	if (NULL == pNeighborReportDesc->pNeighborBssDescription) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -1278,7 +1278,7 @@ end:
 QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 				 void *pMsgBuf)
 {
-	CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_INFO_HIGH,
+	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 		  FL(" Msg = %d for RRM measurement"), msg_type);
 
 	/* switch on the msg type & make the state transition accordingly */
@@ -1293,7 +1293,7 @@ QDF_STATUS sme_rrm_msg_processor(tpAniSirGlobal pMac, uint16_t msg_type,
 
 	default:
 		/* err msg */
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("sme_rrm_msg_processor:unknown msg type = %d"),
 			  msg_type);
 
@@ -1365,7 +1365,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "rrm_open: Fail to init timer");
 
 		return QDF_STATUS_E_FAILURE;
@@ -1378,7 +1378,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "rrm_open: Fail to init timer");
 
 		return QDF_STATUS_E_FAILURE;
@@ -1389,7 +1389,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac)
 	cdf_ret_status =
 		csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache);
 	if (QDF_STATUS_SUCCESS != cdf_ret_status) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  "rrm_open: Fail to open neighbor cache result");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -1418,7 +1418,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 	    qdf_mc_timer_get_current_state(&pSmeRrmContext->IterMeasTimer)) {
 		qdf_status = qdf_mc_timer_stop(&pSmeRrmContext->IterMeasTimer);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 				  FL("Timer stop fail"));
 		}
 	}
@@ -1426,7 +1426,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 	qdf_status = qdf_mc_timer_destroy(&pSmeRrmContext->IterMeasTimer);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
 			  FL("Fail to destroy timer"));
 
 	}
@@ -1439,7 +1439,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 			qdf_mc_timer_stop(&pSmeRrmContext->neighborReqControlInfo.
 					  neighborRspWaitTimer);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+			QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 				  FL("Timer stop fail"));
 		}
 	}
@@ -1448,7 +1448,7 @@ QDF_STATUS rrm_close(tpAniSirGlobal pMac)
 		qdf_mc_timer_destroy(&pSmeRrmContext->neighborReqControlInfo.
 				     neighborRspWaitTimer);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		CDF_TRACE(QDF_MODULE_ID_SME, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_FATAL,
 			  FL("Fail to destroy timer"));
 
 	}
diff --git a/core/utils/epping/inc/epping_internal.h b/core/utils/epping/inc/epping_internal.h
index f815204c7148..0c980de6b759 100644
--- a/core/utils/epping/inc/epping_internal.h
+++ b/core/utils/epping/inc/epping_internal.h
@@ -68,7 +68,7 @@
    -------------------------------------------------------------------------*/
 #define EPPING_MAX_ADAPTERS             1
 
-#define EPPING_LOG(level, args ...) CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
+#define EPPING_LOG(level, args ...) QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 
 struct epping_cookie {
 	HTC_PACKET HtcPkt;      /* HTC packet wrapper */
diff --git a/core/utils/epping/src/epping_helper.c b/core/utils/epping/src/epping_helper.c
index 32fa3e56341b..278693326847 100644
--- a/core/utils/epping/src/epping_helper.c
+++ b/core/utils/epping/src/epping_helper.c
@@ -63,7 +63,7 @@ int epping_cookie_init(epping_context_t *pEpping_ctx)
 			cdf_mem_malloc(sizeof(struct epping_cookie) *
 				       MAX_COOKIE_SLOT_SIZE);
 		if (pEpping_ctx->s_cookie_mem == NULL) {
-			EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+			EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 				   "%s: no mem for cookie (idx = %d)", __func__,
 				   i);
 			goto error;
@@ -175,7 +175,7 @@ void epping_log_packet(epping_adapter_t *pAdapter,
 		       EPPING_HEADER *eppingHdr, int ret, const char *str)
 {
 	if (eppingHdr->Cmd_h & EPPING_LOG_MASK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: cmd = %d, seqNo = %u, flag = 0x%x, ret = %d, "
 			   "txCount = %lu, txDrop =  %lu, txBytes = %lu,"
 			   "rxCount = %lu, rxDrop = %lu, rxBytes = %lu\n",
@@ -192,7 +192,7 @@ void epping_log_packet(epping_adapter_t *pAdapter,
 
 void epping_log_stats(epping_adapter_t *pAdapter, const char *str)
 {
-	EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+	EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 		   "%s: txCount = %lu, txDrop = %lu, tx_bytes = %lu, "
 		   "rxCount = %lu, rxDrop = %lu, rx_bytes = %lu, tx_acks = %u\n",
 		   str,
diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c
index 096c586408d8..f33fbe80e1b4 100644
--- a/core/utils/epping/src/epping_main.c
+++ b/core/utils/epping/src/epping_main.c
@@ -85,12 +85,12 @@ static struct epping_context *g_epping_ctx;
  */
 int epping_open(void)
 {
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__);
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__);
 
 	g_epping_ctx = cdf_mem_malloc(sizeof(*g_epping_ctx));
 
 	if (g_epping_ctx == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_ERROR,
+		EPPING_LOG(QDF_TRACE_LEVEL_ERROR,
 				"%s: cannot alloc epping context", __func__);
 		return -ENOMEM;
 	}
@@ -113,7 +113,7 @@ void epping_disable(void)
 
 	pEpping_ctx = g_epping_ctx;
 	if (pEpping_ctx == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: error: pEpping_ctx  = NULL", __func__);
 		return;
 	}
@@ -141,7 +141,7 @@ void epping_close(void)
 
 
 	if (g_epping_ctx == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: error: g_epping_ctx  = NULL", __func__);
 		return;
 	}
@@ -156,7 +156,7 @@ static void epping_target_suspend_acknowledge(void *context)
 	int wow_nack = *((int *)context);
 
 	if (NULL == g_epping_ctx) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: epping_ctx is NULL", __func__);
 		return;
 	}
@@ -184,12 +184,12 @@ int epping_enable(struct device *parent_dev)
 	struct hif_target_info *tgt_info;
 	struct ol_context *ol_ctx;
 
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__);
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Enter", __func__);
 
 	p_cds_context = cds_get_global_context();
 
 	if (p_cds_context == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Failed cds_get_global_context", __func__);
 		ret = -1;
 		return ret;
@@ -197,7 +197,7 @@ int epping_enable(struct device *parent_dev)
 
 	pEpping_ctx = g_epping_ctx;
 	if (pEpping_ctx == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Failed to get pEpping_ctx", __func__);
 		ret = -1;
 		return ret;
@@ -210,7 +210,7 @@ int epping_enable(struct device *parent_dev)
 
 	scn = cds_get_context(QDF_MODULE_ID_HIF);
 	if (!scn) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: scn is null!", __func__);
 		return -1;
 	}
@@ -224,13 +224,13 @@ int epping_enable(struct device *parent_dev)
 #ifndef FEATURE_BMI_2
 	/* Initialize BMI and Download firmware */
 	if (bmi_download_firmware(ol_ctx)) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: BMI failed to download target", __func__);
 		bmi_cleanup(ol_ctx);
 		return -1;
 	}
 #endif
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH,
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH,
 		   "%s: bmi_download_firmware done", __func__);
 
 	htcInfo.pContext = ol_ctx;
@@ -241,7 +241,7 @@ int epping_enable(struct device *parent_dev)
 	/* Create HTC */
 	p_cds_context->htc_ctx = htc_create(scn, &htcInfo, cdf_ctx);
 	if (!p_cds_context->htc_ctx) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_FATAL,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_FATAL,
 			  "%s: Failed to Create HTC", __func__);
 		bmi_cleanup(ol_ctx);
 		return -1;
@@ -249,35 +249,35 @@ int epping_enable(struct device *parent_dev)
 	pEpping_ctx->HTCHandle =
 		cds_get_context(QDF_MODULE_ID_HTC);
 	if (pEpping_ctx->HTCHandle == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: HTCHandle is NULL", __func__);
 		return -1;
 	}
 
 	if (bmi_done(ol_ctx)) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Failed to complete BMI phase", __func__);
 		goto error_end;
 	}
 
 	/* start HIF */
 	if (htc_wait_target(pEpping_ctx->HTCHandle) != A_OK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: htc_wait_target error", __func__);
 		goto error_end;
 	}
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC ready", __func__);
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC ready", __func__);
 
 	ret = epping_connect_service(pEpping_ctx);
 	if (ret != 0) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: htc_wait_targetdone", __func__);
 		goto error_end;
 	}
 	if (htc_start(pEpping_ctx->HTCHandle) != A_OK) {
 		goto error_end;
 	}
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC started", __func__);
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: HTC started", __func__);
 
 	/* init the tx cookie resource */
 	ret = epping_cookie_init(pEpping_ctx);
@@ -287,14 +287,14 @@ int epping_enable(struct device *parent_dev)
 								 QDF_STA_MODE);
 	}
 	if (ret < 0 || pEpping_ctx->epping_adapter == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: epping_add_adaptererror error", __func__);
 		htc_stop(pEpping_ctx->HTCHandle);
 		epping_cookie_cleanup(pEpping_ctx);
 		goto error_end;
 	}
 
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO_HIGH, "%s: Exit", __func__);
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO_HIGH, "%s: Exit", __func__);
 	return ret;
 
 error_end:
diff --git a/core/utils/epping/src/epping_rx.c b/core/utils/epping/src/epping_rx.c
index 15928e120b8d..ea2d32311c37 100644
--- a/core/utils/epping/src/epping_rx.c
+++ b/core/utils/epping/src/epping_rx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -56,7 +56,7 @@
 #define AR6000_BUFFER_SIZE 1664
 #define AR6000_MIN_HEAD_ROOM 64
 
-static bool enb_rx_dump = 0;
+static bool enb_rx_dump;
 
 #ifdef HIF_SDIO
 void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint)
@@ -78,7 +78,7 @@ void epping_refill(void *ctx, HTC_ENDPOINT_ID Endpoint)
 
 	INIT_HTC_PACKET_QUEUE(&queue);
 
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO,
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO,
 		   "%s: providing htc with %d buffers at eid=%d\n",
 		   __func__, buffersToRefill, Endpoint);
 
@@ -116,7 +116,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket)
 	HTC_ENDPOINT_ID eid = pPacket->Endpoint;
 	struct sk_buff *pktSkb = (struct sk_buff *)pPacket->pPktContext;
 
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO,
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO,
 		   "%s: pAdapter = 0x%p eid=%d, skb=0x%p, data=0x%p, len=0x%x status:%d",
 		   __func__, pAdapter, eid, pktSkb, pPacket->pBuffer,
 		   pPacket->ActualLength, status);
@@ -148,7 +148,7 @@ void epping_rx(void *ctx, HTC_PACKET *pPacket)
 				netif_rx_ni(pktSkb);
 			if ((pAdapter->stats.rx_packets %
 				 EPPING_STATS_LOG_COUNT) == 0) {
-				EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+				EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 					   "%s: total_rx_pkts = %lu",
 					   __func__,
 					   pAdapter->stats.rx_packets);
diff --git a/core/utils/epping/src/epping_tx.c b/core/utils/epping/src/epping_tx.c
index 96e6b357f62f..814f4438dfa3 100644
--- a/core/utils/epping/src/epping_tx.c
+++ b/core/utils/epping/src/epping_tx.c
@@ -64,14 +64,14 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter,
 
 	cookie = epping_alloc_cookie(pAdapter->pEpping_ctx);
 	if (cookie == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: epping_alloc_cookie returns no resource\n",
 			   __func__);
 		return;
 	}
 	new_skb = cdf_nbuf_copy(skb);
 	if (!new_skb) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: cdf_nbuf_copy returns no resource\n", __func__);
 		epping_free_cookie(pAdapter->pEpping_ctx, cookie);
 		return;
@@ -84,7 +84,7 @@ void epping_tx_dup_pkt(epping_adapter_t *pAdapter,
 	/* send the packet */
 	ret = htc_send_pkt(pAdapter->pEpping_ctx->HTCHandle, &cookie->HtcPkt);
 	if (ret != A_OK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: htc_send_pkt failed, ret = %d\n", __func__, ret);
 		epping_free_cookie(pAdapter->pEpping_ctx, cookie);
 		cdf_nbuf_free(new_skb);
@@ -113,7 +113,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	cookie = epping_alloc_cookie(pAdapter->pEpping_ctx);
 	/* no resource */
 	if (cookie == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: epping_alloc_cookie returns no resource\n",
 			   __func__);
 		return -1;
@@ -133,7 +133,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	ac = eppingHdr->StreamNo_h;
 	eid = pAdapter->pEpping_ctx->EppingEndpoint[ac];
 	if (eid < 0 || eid >= EPPING_MAX_NUM_EPIDS) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: invalid eid = %d, ac = %d\n", __func__, eid,
 			   ac);
 		return -1;
@@ -151,7 +151,7 @@ static int epping_tx_send_int(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	ret = htc_send_pkt(pAdapter->pEpping_ctx->HTCHandle, &cookie->HtcPkt);
 	epping_log_packet(pAdapter, &tmpHdr, ret, __func__);
 	if (ret != A_OK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: htc_send_pkt failed, status = %d\n", __func__,
 			   ret);
 		epping_free_cookie(pAdapter->pEpping_ctx, cookie);
@@ -172,7 +172,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter)
 {
 	cdf_nbuf_t nodrop_skb;
 
-	EPPING_LOG(CDF_TRACE_LEVEL_INFO, "%s: queue len: %d\n", __func__,
+	EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: queue len: %d\n", __func__,
 		   cdf_nbuf_queue_len(&pAdapter->nodrop_queue));
 
 	if (!cdf_nbuf_queue_len(&pAdapter->nodrop_queue)) {
@@ -184,7 +184,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter)
 	/* try to flush nodrop queue */
 	while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) {
 		if (epping_tx_send_int(nodrop_skb, pAdapter)) {
-			EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+			EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 				   "%s: nodrop: %p xmit fail in timer\n",
 				   __func__, nodrop_skb);
 			/* fail to xmit so put the nodrop packet to the nodrop queue */
@@ -192,7 +192,7 @@ void epping_tx_timer_expire(epping_adapter_t *pAdapter)
 						   nodrop_skb);
 			break;
 		} else {
-			EPPING_LOG(CDF_TRACE_LEVEL_INFO,
+			EPPING_LOG(QDF_TRACE_LEVEL_INFO,
 				   "%s: nodrop: %p xmit ok in timer\n",
 				   __func__, nodrop_skb);
 		}
@@ -222,7 +222,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	eppingHdr = (EPPING_HEADER *) cdf_nbuf_data(skb);
 
 	if (!IS_EPPING_PACKET(eppingHdr)) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Recived non endpoint ping packets\n", __func__);
 		/* no packet to send, cleanup */
 		cdf_nbuf_free(skb);
@@ -233,7 +233,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	ac = eppingHdr->StreamNo_h;
 	/* hard coded two ep ids */
 	if (ac != 0 && ac != 1) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: ac %d is not mapped to mboxping service\n",
 			   __func__, ac);
 		cdf_nbuf_free(skb);
@@ -254,7 +254,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 	/* check the nodrop queue first */
 	while ((nodrop_skb = cdf_nbuf_queue_remove(&pAdapter->nodrop_queue))) {
 		if (epping_tx_send_int(nodrop_skb, pAdapter)) {
-			EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+			EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 				   "%s: nodrop: %p xmit fail\n", __func__,
 				   nodrop_skb);
 			/* fail to xmit so put the nodrop packet to the nodrop queue */
@@ -263,7 +263,7 @@ int epping_tx_send(cdf_nbuf_t skb, epping_adapter_t *pAdapter)
 			/* no cookie so free the current skb */
 			goto tx_fail;
 		} else {
-			EPPING_LOG(CDF_TRACE_LEVEL_INFO,
+			EPPING_LOG(QDF_TRACE_LEVEL_INFO,
 				   "%s: nodrop: %p xmit ok\n", __func__,
 				   nodrop_skb);
 		}
@@ -280,12 +280,12 @@ tx_fail:
 		/* allow to drop the skb so drop it */
 		cdf_nbuf_free(skb);
 		++pAdapter->stats.tx_dropped;
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Tx skb %p dropped, stats.tx_dropped = %ld\n",
 			   __func__, skb, pAdapter->stats.tx_dropped);
 		return -ENOMEM;
 	} else {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: nodrop: %p queued\n", __func__, skb);
 		cdf_nbuf_queue_add(&pAdapter->nodrop_queue, skb);
 		qdf_spin_lock_bh(&pAdapter->data_lock);
@@ -345,7 +345,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue)
 		if (A_SUCCESS(status)) {
 			ASSERT(htc_pkt->ActualLength == cdf_nbuf_len(pktSkb));
 		}
-		EPPING_LOG(CDF_TRACE_LEVEL_INFO,
+		EPPING_LOG(QDF_TRACE_LEVEL_INFO,
 			   "%s skb=%p data=%p len=0x%x eid=%d ",
 			   __func__, pktSkb, htc_pkt->pBuffer,
 			   htc_pkt->ActualLength, eid);
@@ -360,7 +360,7 @@ void epping_tx_complete_multiple(void *ctx, HTC_PACKET_QUEUE *pPacketQueue)
 				       __func__, status);
 			}
 		} else {
-			EPPING_LOG(CDF_TRACE_LEVEL_INFO, "%s: OK\n", __func__);
+			EPPING_LOG(QDF_TRACE_LEVEL_INFO, "%s: OK\n", __func__);
 			flushing = false;
 		}
 
diff --git a/core/utils/epping/src/epping_txrx.c b/core/utils/epping/src/epping_txrx.c
index 0cfe95687128..4012af562a1f 100644
--- a/core/utils/epping/src/epping_txrx.c
+++ b/core/utils/epping/src/epping_txrx.c
@@ -62,14 +62,14 @@ static void epping_timer_expire(void *data)
 	epping_adapter_t *pAdapter;
 
 	if (dev == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: netdev = NULL", __func__);
 		return;
 	}
 
 	pAdapter = netdev_priv(dev);
 	if (pAdapter == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: adapter = NULL", __func__);
 		return;
 	}
@@ -94,7 +94,7 @@ static int epping_ndev_stop(struct net_device *dev)
 
 	pAdapter = netdev_priv(dev);
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: EPPING adapter context is Null", __func__);
 		ret = -ENODEV;
 		goto end;
@@ -110,7 +110,7 @@ static void epping_ndev_uninit(struct net_device *dev)
 
 	pAdapter = netdev_priv(dev);
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: EPPING adapter context is Null", __func__);
 		goto end;
 	}
@@ -125,12 +125,12 @@ void epping_tx_queue_timeout(struct net_device *dev)
 
 	pAdapter = netdev_priv(dev);
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: EPPING adapter context is Null", __func__);
 		goto end;
 	}
 
-	EPPING_LOG(CDF_TRACE_LEVEL_ERROR,
+	EPPING_LOG(QDF_TRACE_LEVEL_ERROR,
 		   "%s: Transmission timeout occurred, pAdapter->started= %d",
 		   __func__, pAdapter->started);
 
@@ -153,7 +153,7 @@ int epping_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 	pAdapter = netdev_priv(dev);
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: EPPING adapter context is Null", __func__);
 		ret = -ENODEV;
 		goto end;
@@ -168,7 +168,7 @@ struct net_device_stats *epping_get_stats(struct net_device *dev)
 	epping_adapter_t *pAdapter = netdev_priv(dev);
 
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_ERROR, "%s: pAdapter = NULL",
+		EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: pAdapter = NULL",
 			   __func__);
 		return NULL;
 	}
@@ -183,13 +183,13 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 	pAdapter = netdev_priv(dev);
 	if (NULL == pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: EPPING adapter context is Null", __func__);
 		ret = -ENODEV;
 		goto end;
 	}
 	if (dev != pAdapter->dev) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: HDD adapter/dev inconsistency", __func__);
 		ret = -ENODEV;
 		goto end;
@@ -202,12 +202,12 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 
 	switch (cmd) {
 	case (SIOCDEVPRIVATE + 1):
-		EPPING_LOG(CDF_TRACE_LEVEL_ERROR,
+		EPPING_LOG(QDF_TRACE_LEVEL_ERROR,
 			   "%s: do not support ioctl %d (SIOCDEVPRIVATE + 1)",
 			   __func__, cmd);
 		break;
 	default:
-		EPPING_LOG(CDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d",
+		EPPING_LOG(QDF_TRACE_LEVEL_ERROR, "%s: unknown ioctl %d",
 			   __func__, cmd);
 		ret = -EINVAL;
 		break;
@@ -243,7 +243,7 @@ static void epping_stop_adapter(epping_adapter_t *pAdapter)
 static int epping_start_adapter(epping_adapter_t *pAdapter)
 {
 	if (!pAdapter) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: pAdapter= NULL\n", __func__);
 		return -1;
 	}
@@ -256,7 +256,7 @@ static int epping_start_adapter(epping_adapter_t *pAdapter)
 		netif_tx_start_all_queues(pAdapter->dev);
 		pAdapter->started = true;
 	} else {
-		EPPING_LOG(CDF_TRACE_LEVEL_WARN,
+		EPPING_LOG(QDF_TRACE_LEVEL_WARN,
 			   "%s: pAdapter %p already started\n", __func__,
 			   pAdapter);
 	}
@@ -269,7 +269,7 @@ static int epping_register_adapter(epping_adapter_t *pAdapter)
 
 	ret = register_netdev(pAdapter->dev);
 	if (ret != 0) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: unable to register device\n",
 			   pAdapter->dev->name);
 	} else {
@@ -287,7 +287,7 @@ static void epping_unregister_adapter(epping_adapter_t *pAdapter)
 			pAdapter->registered = false;
 		}
 	} else {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: pAdapter = NULL, unable to unregister device\n",
 			   __func__);
 	}
@@ -299,7 +299,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter)
 	epping_context_t *pEpping_ctx;
 
 	if (!pAdapter || !pAdapter->pEpping_ctx) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: pAdapter = NULL\n", __func__);
 		return;
 	}
@@ -321,7 +321,7 @@ void epping_destroy_adapter(epping_adapter_t *pAdapter)
 
 	free_netdev(dev);
 	if (!pEpping_ctx)
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: pEpping_ctx = NULL\n", __func__);
 	else
 		pEpping_ctx->epping_adapter = NULL;
@@ -354,7 +354,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx,
 #endif
 			   ether_setup);
 	if (dev == NULL) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "%s: Cannot allocate epping_adapter_t\n", __func__);
 		return NULL;
 	}
@@ -390,6 +390,7 @@ epping_adapter_t *epping_add_adapter(epping_context_t *pEpping_ctx,
 int epping_connect_service(epping_context_t *pEpping_ctx)
 {
 	int status, i;
+	int ret = -1;
 	HTC_SERVICE_CONNECT_REQ connect;
 	HTC_SERVICE_CONNECT_RESP response;
 
@@ -419,12 +420,12 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 	connect.service_id = WMI_DATA_BE_SVC;
 	status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response);
 	if (status != EOK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "Failed to connect to Endpoint Ping BE service status:%d \n",
 			   status);
 		return -1;;
 	} else {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "eppingtest BE endpoint:%d\n", response.Endpoint);
 	}
 	pEpping_ctx->EppingEndpoint[0] = response.Endpoint;
@@ -433,12 +434,12 @@ int epping_connect_service(epping_context_t *pEpping_ctx)
 	connect.service_id = WMI_DATA_BK_SVC;
 	status = htc_connect_service(pEpping_ctx->HTCHandle, &connect, &response);
 	if (status != EOK) {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "Failed to connect to Endpoint Ping BK service status:%d \n",
 			   status);
-		return -1;;
+		return ret;
 	} else {
-		EPPING_LOG(CDF_TRACE_LEVEL_FATAL,
+		EPPING_LOG(QDF_TRACE_LEVEL_FATAL,
 			   "eppingtest BK endpoint:%d\n", response.Endpoint);
 	}
 	pEpping_ctx->EppingEndpoint[1] = response.Endpoint;
diff --git a/core/utils/host_diag_log/src/host_diag_log.c b/core/utils/host_diag_log/src/host_diag_log.c
index 0e1c570fe1ce..0ad80713f3f7 100644
--- a/core/utils/host_diag_log/src/host_diag_log.c
+++ b/core/utils/host_diag_log/src/host_diag_log.c
@@ -117,7 +117,7 @@ void host_diag_log_submit(void *plog_hdr_ptr)
 	uint16_t total_len;
 
 	if (cds_is_load_or_unload_in_progress()) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 			  "%s: Unloading/Loading in Progress. Ignore!!!",
 			  __func__);
 		return;
@@ -134,7 +134,7 @@ void host_diag_log_submit(void *plog_hdr_ptr)
 		pBuf = (uint8_t *) cdf_mem_malloc(total_len);
 
 		if (!pBuf) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "cdf_mem_malloc failed");
 			return;
 		}
@@ -214,7 +214,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length,
 	uint16_t total_len;
 
 	if (cds_is_load_or_unload_in_progress()) {
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 			  "%s: Unloading/Loading in Progress. Ignore!!!",
 			  __func__);
 		return;
@@ -229,7 +229,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length,
 		pBuf = (uint8_t *) cdf_mem_malloc(total_len);
 
 		if (!pBuf) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "cdf_mem_malloc failed");
 			return;
 		}
@@ -250,7 +250,7 @@ void host_diag_event_report_payload(uint16_t event_Id, uint16_t length,
 
 		if (ptt_sock_send_msg_to_app
 			    (wmsg, 0, ANI_NL_MSG_PUMAC, INVALID_PID) < 0) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 				  "Ptt Socket error sending message to the app!!");
 			cdf_mem_free((void *)wmsg);
 			return;
diff --git a/core/utils/logging/inc/wlan_logging_sock_svc.h b/core/utils/logging/inc/wlan_logging_sock_svc.h
index d6c94930ba49..1850a0138466 100644
--- a/core/utils/logging/inc/wlan_logging_sock_svc.h
+++ b/core/utils/logging/inc/wlan_logging_sock_svc.h
@@ -35,14 +35,14 @@
 
 #include <wlan_nlink_srv.h>
 #include <qdf_status.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <wlan_nlink_common.h>
 
 int wlan_logging_sock_init_svc(void);
 int wlan_logging_sock_deinit_svc(void);
 int wlan_logging_sock_activate_svc(int log_fe_to_console, int num_buf);
 int wlan_logging_sock_deactivate_svc(void);
-int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length);
+int wlan_log_to_user(QDF_TRACE_LEVEL log_level, char *to_be_sent, int length);
 void wlan_logging_set_per_pkt_stats(void);
 void wlan_logging_set_log_level(void);
 void wlan_logging_set_fw_flush_complete(void);
diff --git a/core/utils/logging/src/wlan_logging_sock_svc.c b/core/utils/logging/src/wlan_logging_sock_svc.c
index 04e367499820..55eefa96d4a7 100644
--- a/core/utils/logging/src/wlan_logging_sock_svc.c
+++ b/core/utils/logging/src/wlan_logging_sock_svc.c
@@ -41,7 +41,7 @@
 #include <host_diag_core_event.h>
 
 #define LOGGING_TRACE(level, args ...) \
-	CDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
+	QDF_TRACE(QDF_MODULE_ID_HDD, level, ## args)
 
 /* Global variables */
 
@@ -119,7 +119,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio,
 	static int nlmsg_seq;
 
 	if (radio < 0 || radio > ANI_MAX_RADIOS) {
-		LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+		LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			      "%s: invalid radio id [%d]", __func__, radio);
 		return -EINVAL;
 	}
@@ -128,7 +128,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio,
 	tot_msg_len = NLMSG_SPACE(payload_len);
 	skb = dev_alloc_skb(tot_msg_len);
 	if (skb == NULL) {
-		LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+		LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			      "%s: dev_alloc_skb() failed for msg size[%d]",
 			      __func__, tot_msg_len);
 		return -ENOMEM;
@@ -136,7 +136,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio,
 	nlh = nlmsg_put(skb, pid, nlmsg_seq++, src_mod, payload_len,
 			NLM_F_REQUEST);
 	if (NULL == nlh) {
-		LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+		LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			      "%s: nlmsg_put() failed for msg size[%d]",
 			      __func__, tot_msg_len);
 		kfree_skb(skb);
@@ -146,7 +146,7 @@ static int wlan_send_sock_msg_to_app(tAniHdr *wmsg, int radio,
 	wnl = (tAniNlHdr *) nlh;
 	wnl->radio = radio;
 	memcpy(&wnl->wmsg, wmsg, wmsg_length);
-	LOGGING_TRACE(CDF_TRACE_LEVEL_INFO,
+	LOGGING_TRACE(QDF_TRACE_LEVEL_INFO,
 		      "%s: Sending Msg Type [0x%X] to pid[%d]\n",
 		      __func__, be16_to_cpu(wmsg->type), pid);
 
@@ -183,10 +183,10 @@ static void set_default_logtoapp_log_level(void)
 	/* module id 0 is reserved */
 	for (i = 1; i < QDF_MODULE_ID_MAX; i++) {
 		if (is_data_path_module(i))
-			cdf_trace_set_module_trace_level(i,
-					CDF_DATA_PATH_TRACE_LEVEL);
+			qdf_trace_set_module_trace_level(i,
+					QDF_DATA_PATH_TRACE_LEVEL);
 		else
-			cdf_trace_set_value(i, CDF_TRACE_LEVEL_ALL, true);
+			qdf_trace_set_value(i, QDF_TRACE_LEVEL_ALL, true);
 	}
 }
 
@@ -195,12 +195,12 @@ static void clear_default_logtoapp_log_level(void)
 	int module;
 
 	for (module = 0; module < QDF_MODULE_ID_MAX; module++) {
-		cdf_trace_set_value(module, CDF_TRACE_LEVEL_NONE, false);
-		cdf_trace_set_value(module, CDF_TRACE_LEVEL_FATAL, true);
-		cdf_trace_set_value(module, CDF_TRACE_LEVEL_ERROR, true);
+		qdf_trace_set_value(module, QDF_TRACE_LEVEL_NONE, false);
+		qdf_trace_set_value(module, QDF_TRACE_LEVEL_FATAL, true);
+		qdf_trace_set_value(module, QDF_TRACE_LEVEL_ERROR, true);
 	}
 
-	cdf_trace_set_value(QDF_MODULE_ID_RSV4, CDF_TRACE_LEVEL_NONE,
+	qdf_trace_set_value(QDF_MODULE_ID_RSV4, QDF_TRACE_LEVEL_NONE,
 			    false);
 }
 
@@ -297,7 +297,7 @@ static int wlan_add_user_log_time_stamp(char *tbuf, size_t tbuf_sz, uint64_t ts)
 }
 #endif
 
-int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length)
+int wlan_log_to_user(QDF_TRACE_LEVEL log_level, char *to_be_sent, int length)
 {
 	/* Add the current time stamp */
 	char *ptr;
@@ -352,13 +352,13 @@ int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length)
 	/* Assumption here is that we receive logs which is always less than
 	 * MAX_LOGMSG_LENGTH, where we can accomodate the
 	 *   tAniNlHdr + [context][timestamp] + log
-	 * CDF_ASSERT if we cannot accomodate the the complete log into
+	 * QDF_ASSERT if we cannot accomodate the the complete log into
 	 * the available buffer.
 	 *
 	 * Continue and copy logs to the available length and discard the rest.
 	 */
 	if (MAX_LOGMSG_LENGTH < (sizeof(tAniNlHdr) + total_log_len)) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		total_log_len = MAX_LOGMSG_LENGTH - sizeof(tAniNlHdr) - 2;
 	}
 
@@ -378,8 +378,8 @@ int wlan_log_to_user(CDF_TRACE_LEVEL log_level, char *to_be_sent, int length)
 	}
 
 	if (gwlan_logging.log_fe_to_console
-	    && ((CDF_TRACE_LEVEL_FATAL == log_level)
-		|| (CDF_TRACE_LEVEL_ERROR == log_level))) {
+	    && ((QDF_TRACE_LEVEL_FATAL == log_level)
+		|| (QDF_TRACE_LEVEL_ERROR == log_level))) {
 		pr_info("%s\n", to_be_sent);
 	}
 
@@ -509,7 +509,7 @@ void send_flush_completion_to_user(void)
 	cds_get_log_completion(&is_fatal, &indicator, &reason_code);
 
 	/* Error on purpose, so that it will get logged in the kmsg */
-	LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+	LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			"%s: Sending flush done to userspace", __func__);
 
 	wlan_report_log_completion(is_fatal, indicator, reason_code);
@@ -616,7 +616,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb)
 	type = wnl->nlh.nlmsg_type;
 
 	if (radio < 0 || radio > ANI_MAX_RADIOS) {
-		LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+		LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			      "%s: invalid radio id [%d]\n", __func__, radio);
 		return -EINVAL;
 	}
@@ -644,7 +644,7 @@ static int wlan_logging_proc_sock_rx_msg(struct sk_buff *skb)
 	ret = wlan_send_sock_msg_to_app(&wnl->wmsg, 0,
 					ANI_NL_MSG_LOG, wnl->nlh.nlmsg_pid);
 	if (ret < 0) {
-		LOGGING_TRACE(CDF_TRACE_LEVEL_ERROR,
+		LOGGING_TRACE(QDF_TRACE_LEVEL_ERROR,
 			      "wlan_send_sock_msg_to_app: failed");
 	}
 
diff --git a/core/utils/nlink/src/wlan_nlink_srv.c b/core/utils/nlink/src/wlan_nlink_srv.c
index e1134049877c..80055a64f656 100644
--- a/core/utils/nlink/src/wlan_nlink_srv.c
+++ b/core/utils/nlink/src/wlan_nlink_srv.c
@@ -41,7 +41,7 @@
 #include <linux/skbuff.h>
 #include <net/sock.h>
 #include <wlan_nlink_srv.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 
 /* Global variables */
 static DEFINE_MUTEX(nl_srv_sem);
@@ -71,7 +71,7 @@ int nl_srv_init(void)
 	if (nl_srv_sock != NULL) {
 		memset(nl_srv_msg_handler, 0, sizeof(nl_srv_msg_handler));
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 			  "NLINK: netlink_kernel_create failed");
 		retcode = -ECONNREFUSED;
 	}
@@ -103,7 +103,7 @@ int nl_srv_register(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler)
 	    msg_handler != NULL) {
 		nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = msg_handler;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: nl_srv_register failed for msg_type %d",
 			  msg_type);
 		retcode = -EINVAL;
@@ -123,7 +123,7 @@ int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler)
 	    (nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] == msg_handler)) {
 		nl_srv_msg_handler[msg_type - WLAN_NL_MSG_BASE] = NULL;
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: nl_srv_unregister failed for msg_type %d",
 			  msg_type);
 		retcode = -EINVAL;
@@ -147,7 +147,7 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag)
 		err = netlink_unicast(nl_srv_sock, skb, dst_pid, flag);
 
 	if (err < 0)
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: netlink_unicast to pid[%d] failed, ret[0x%X]",
 			  dst_pid, err);
 
@@ -174,7 +174,7 @@ int nl_srv_bcast(struct sk_buff *skb)
 					WLAN_NLINK_MCAST_GRP_ID, flags);
 
 	if (err < 0) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: netlink_broadcast failed err = %d", err);
 	}
 	return err;
@@ -207,7 +207,7 @@ static void nl_srv_rcv_skb(struct sk_buff *skb)
 		nlh = (struct nlmsghdr *)skb->data;
 
 		if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len) {
-			CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+			QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 				  "NLINK: Invalid "
 				  "Netlink message: skb[%p], len[%d], nlhdr[%p], nlmsg_len[%d]",
 				  skb, skb->len, nlh, nlh->nlmsg_len);
@@ -232,7 +232,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
 	/* Only requests are handled by kernel now */
 	if (!(nlh->nlmsg_flags & NLM_F_REQUEST)) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: Received Invalid NL Req type [%x]",
 			  nlh->nlmsg_flags);
 		return;
@@ -242,7 +242,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 
 	/* Unknown message */
 	if (type < WLAN_NL_MSG_BASE || type >= WLAN_NL_MSG_MAX) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: Received Invalid NL Msg type [%x]", type);
 		return;
 	}
@@ -252,13 +252,13 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 	 * Drop any message with invalid length
 	 */
 	if (nlh->nlmsg_len < NLMSG_LENGTH(sizeof(tAniMsgHdr))) {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: Received NL Msg with invalid len[%x]",
 			  nlh->nlmsg_len);
 		return;
 	}
 
-	CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_INFO,
 		  "NLINK: Received NL msg type [%d]", type);
 
 	/* turn type into dispatch table offset */
@@ -268,7 +268,7 @@ static void nl_srv_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
 	if (nl_srv_msg_handler[type] != NULL) {
 		(nl_srv_msg_handler[type])(skb);
 	} else {
-		CDF_TRACE(QDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_WARN,
+		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_WARN,
 			  "NLINK: No handler for Netlink Msg [0x%X]", type);
 	}
 }
diff --git a/core/utils/ptt/inc/wlan_ptt_sock_svc.h b/core/utils/ptt/inc/wlan_ptt_sock_svc.h
index 07ec6f7c5a42..08c149053446 100644
--- a/core/utils/ptt/inc/wlan_ptt_sock_svc.h
+++ b/core/utils/ptt/inc/wlan_ptt_sock_svc.h
@@ -34,7 +34,7 @@
 #include <wlan_nlink_srv.h>
 #include <qdf_types.h>
 #include <qdf_status.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <wlan_nlink_common.h>
 /*
  * Quarky Message Format:
diff --git a/core/utils/ptt/src/wlan_ptt_sock_svc.c b/core/utils/ptt/src/wlan_ptt_sock_svc.c
index b63799e1cbbd..fe81e8c2d7c7 100644
--- a/core/utils/ptt/src/wlan_ptt_sock_svc.c
+++ b/core/utils/ptt/src/wlan_ptt_sock_svc.c
@@ -33,15 +33,15 @@
 #include <wlan_nlink_srv.h>
 #include <qdf_types.h>
 #include <qdf_status.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 #include <wlan_nlink_common.h>
 #include <wlan_ptt_sock_svc.h>
 #include <qdf_types.h>
-#include <cdf_trace.h>
+#include <qdf_trace.h>
 
 #define PTT_SOCK_DEBUG
 #ifdef PTT_SOCK_DEBUG
-#define PTT_TRACE(level, args ...) CDF_TRACE(QDF_MODULE_ID_QDF, level, ## args)
+#define PTT_TRACE(level, args ...) QDF_TRACE(QDF_MODULE_ID_QDF, level, ## args)
 #else
 #define PTT_TRACE(level, args ...)
 #endif
@@ -56,13 +56,13 @@ static void ptt_sock_dump_buf(const unsigned char *pbuf, int cnt)
 	int i;
 	for (i = 0; i < cnt; i++) {
 		if ((i % 16) == 0)
-			CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO,
+			QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO,
 				  "\n%p:", pbuf);
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, " %02X",
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, " %02X",
 			  *pbuf);
 		pbuf++;
 	}
-	CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_INFO, "\n");
+	QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_INFO, "\n");
 }
 #endif
 
@@ -90,7 +90,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid)
 	static int nlmsg_seq;
 
 	if (radio < 0 || radio > ANI_MAX_RADIOS) {
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n",
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: invalid radio id [%d]\n",
 			  __func__, radio);
 		return -EINVAL;
 	}
@@ -98,7 +98,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid)
 	tot_msg_len = NLMSG_SPACE(payload_len);
 	skb = dev_alloc_skb(tot_msg_len);
 	if (skb  == NULL) {
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR,
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR,
 			  "%s: dev_alloc_skb() failed for msg size[%d]\n",
 			  __func__, tot_msg_len);
 		return -ENOMEM;
@@ -107,7 +107,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid)
 		nlmsg_put(skb, pid, nlmsg_seq++, src_mod, payload_len,
 			  NLM_F_REQUEST);
 	if (NULL == nlh) {
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR,
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR,
 			  "%s: nlmsg_put() failed for msg size[%d]\n", __func__,
 			  tot_msg_len);
 		kfree_skb(skb);
@@ -116,7 +116,7 @@ int ptt_sock_send_msg_to_app(tAniHdr *wmsg, int radio, int src_mod, int pid)
 	wnl = (tAniNlHdr *) nlh;
 	wnl->radio = radio;
 	memcpy(&wnl->wmsg, wmsg, wmsg_length);
-	PTT_TRACE(CDF_TRACE_LEVEL_INFO,
+	PTT_TRACE(QDF_TRACE_LEVEL_INFO,
 		  "%s: Sending Msg Type [0x%X] to pid[%d]\n", __func__,
 		  be16_to_cpu(wmsg->type), pid);
 #ifdef PTT_SOCK_DEBUG_VERBOSE
@@ -151,7 +151,7 @@ static void ptt_sock_proc_reg_req(tAniHdr *wmsg, int radio)
 	rspmsg.wniHdr.length = cpu_to_be16(sizeof(rspmsg));
 	if (ptt_sock_send_msg_to_app((tAniHdr *) &rspmsg.wniHdr, radio,
 				     ANI_NL_MSG_PUMAC, ptt_pid) < 0) {
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR,
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR,
 			  "%s: Error sending ANI_MSG_APP_REG_RSP to pid[%d]\n",
 			  __func__, ptt_pid);
 	}
@@ -165,13 +165,13 @@ static void ptt_proc_pumac_msg(struct sk_buff *skb, tAniHdr *wmsg, int radio)
 	u16 ani_msg_type = be16_to_cpu(wmsg->type);
 	switch (ani_msg_type) {
 	case ANI_MSG_APP_REG_REQ:
-		PTT_TRACE(CDF_TRACE_LEVEL_INFO,
+		PTT_TRACE(QDF_TRACE_LEVEL_INFO,
 			  "%s: Received ANI_MSG_APP_REG_REQ [0x%X]\n", __func__,
 			  ani_msg_type);
 		ptt_sock_proc_reg_req(wmsg, radio);
 		break;
 	default:
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR,
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR,
 			  "%s: Received Unknown Msg Type[0x%X]\n", __func__,
 			  ani_msg_type);
 		break;
@@ -191,13 +191,13 @@ static int ptt_sock_rx_nlink_msg(struct sk_buff *skb)
 	type = wnl->nlh.nlmsg_type;
 	switch (type) {
 	case ANI_NL_MSG_PUMAC:  /* Message from the PTT socket APP */
-		PTT_TRACE(CDF_TRACE_LEVEL_INFO,
+		PTT_TRACE(QDF_TRACE_LEVEL_INFO,
 			  "%s: Received ANI_NL_MSG_PUMAC Msg [0x%X]\n",
 			  __func__, type);
 		ptt_proc_pumac_msg(skb, &wnl->wmsg, radio);
 		break;
 	default:
-		PTT_TRACE(CDF_TRACE_LEVEL_ERROR, "%s: Unknown NL Msg [0x%X]\n",
+		PTT_TRACE(QDF_TRACE_LEVEL_ERROR, "%s: Unknown NL Msg [0x%X]\n",
 			  __func__, type);
 		break;
 	}
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index b7bfb6c502ea..7832672223c6 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -93,21 +93,21 @@
 #define WMA_11P_CHANNEL_END             (184)
 
 #define WMA_LOGD(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG, ## args)
 #define WMA_LOGI(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO, ## args)
 #define WMA_LOGW(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_WARN, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_WARN, ## args)
 #define WMA_LOGE(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR, ## args)
 #define WMA_LOGP(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_FATAL, ## args)
 
 #define WMA_DEBUG_ALWAYS
 
 #ifdef WMA_DEBUG_ALWAYS
 #define WMA_LOGA(args ...) \
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_FATAL, ## args)
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_FATAL, ## args)
 #else
 #define WMA_LOGA(args ...)
 #endif
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index 592c1554c9db..78cd55ecbe1a 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -1063,20 +1063,20 @@ QDF_STATUS wma_set_mcc_channel_time_latency
 
 	if (!wma) {
 		WMA_LOGE("%s:NULL wma ptr. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	pMac = cds_get_context(QDF_MODULE_ID_PE);
 	if (!pMac) {
 		WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	/* First step is to confirm if MCC is active */
 	if (!lim_is_in_mcc(pMac)) {
 		WMA_LOGE("%s: MCC is not active. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* Confirm MCC adaptive scheduler feature is disabled */
@@ -1090,7 +1090,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency
 	} else {
 		WMA_LOGE("%s: Failed to get value for MCC_ADAPTIVE_SCHED, "
 			 "Exit w/o setting latency", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	/* If 0ms latency is provided, then FW will set to a default.
@@ -1135,7 +1135,7 @@ QDF_STATUS wma_set_mcc_channel_time_latency
 		WMA_LOGE("%s: Failed to send MCC Channel Time Latency command",
 			 __func__);
 		cdf_nbuf_free(buf);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	return QDF_STATUS_SUCCESS;
@@ -1187,20 +1187,20 @@ QDF_STATUS wma_set_mcc_channel_time_quota
 
 	if (!wma) {
 		WMA_LOGE("%s:NULL wma ptr. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	pMac = cds_get_context(QDF_MODULE_ID_PE);
 	if (!pMac) {
 		WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	/* First step is to confirm if MCC is active */
 	if (!lim_is_in_mcc(pMac)) {
 		WMA_LOGD("%s: MCC is not active. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1216,7 +1216,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota
 	} else {
 		WMA_LOGE("%s: Failed to retrieve "
 			 "WNI_CFG_ENABLE_MCC_ADAPTIVE_SCHED. Exit", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -1236,7 +1236,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota
 	buf = wmi_buf_alloc(wma->wmi_handle, len);
 	if (!buf) {
 		WMA_LOGE("%s : wmi_buf_alloc failed", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_NOMEM;
 	}
 	buf_ptr = (uint8_t *) wmi_buf_data(buf);
@@ -1267,7 +1267,7 @@ QDF_STATUS wma_set_mcc_channel_time_quota
 	if (ret) {
 		WMA_LOGE("Failed to send MCC Channel Time Quota command");
 		cdf_nbuf_free(buf);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 	return QDF_STATUS_SUCCESS;
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 1da4dfb47e35..a4ce0beab19f 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -113,7 +113,7 @@ bool wma_is_vdev_in_ap_mode(tp_wma_handle wma, uint8_t vdev_id)
 
 	if (vdev_id > wma->max_bssid) {
 		WMA_LOGP("%s: Invalid vdev_id %hu", __func__, vdev_id);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return false;
 	}
 
@@ -142,7 +142,7 @@ bool wma_is_vdev_in_ibss_mode(tp_wma_handle wma, uint8_t vdev_id)
 
 	if (vdev_id > wma->max_bssid) {
 		WMA_LOGP("%s: Invalid vdev_id %hu", __func__, vdev_id);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return false;
 	}
 
@@ -2587,12 +2587,12 @@ void wma_hold_req_timer(void *data)
 		 * Assert in development build only.
 		 * Send response in production builds.
 		 */
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		wma_send_msg(wma, WMA_DELETE_STA_RSP, (void *)params, 0);
 	} else if ((tgt_req->msg_type == WMA_DELETE_STA_REQ) &&
 		(tgt_req->type == WMA_DEL_P2P_SELF_STA_RSP_START)) {
 		WMA_LOGA(FL("wma delete sta p2p request timed out"));
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 free_tgt_req:
 	qdf_mc_timer_destroy(&tgt_req->event_timeout);
diff --git a/core/wma/src/wma_features.c b/core/wma/src/wma_features.c
index 0902ba66d574..c3ae9572d088 100644
--- a/core/wma/src/wma_features.c
+++ b/core/wma/src/wma_features.c
@@ -2946,8 +2946,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event,
 				param_buf->wow_packet_buffer + 4,
 				wow_buf_pkt_len,
 				WOW_REASON_PATTERN_MATCH_FOUND);
-			cdf_trace_hex_dump(QDF_MODULE_ID_WMA,
-					   CDF_TRACE_LEVEL_DEBUG,
+			qdf_trace_hex_dump(QDF_MODULE_ID_WMA,
+					   QDF_TRACE_LEVEL_DEBUG,
 					   param_buf->wow_packet_buffer + 4,
 					   wow_buf_pkt_len);
 		} else {
@@ -2970,8 +2970,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event,
 			cdf_mem_copy((uint8_t *) &wow_buf_pkt_len,
 				     param_buf->wow_packet_buffer, 4);
 			WMA_LOGD("wow_packet_buffer dump");
-			cdf_trace_hex_dump(QDF_MODULE_ID_WMA,
-					   CDF_TRACE_LEVEL_DEBUG,
+			qdf_trace_hex_dump(QDF_MODULE_ID_WMA,
+					   QDF_TRACE_LEVEL_DEBUG,
 					   param_buf->wow_packet_buffer,
 					   wow_buf_pkt_len);
 			if (wow_buf_pkt_len >= sizeof(param)) {
@@ -3003,8 +3003,8 @@ int wma_wow_wakeup_host_event(void *handle, uint8_t *event,
 		    cdf_mem_copy((u_int8_t *) &wow_buf_pkt_len,
 				param_buf->wow_packet_buffer, 4);
 		    WMA_LOGD("wow_packet_buffer dump");
-				cdf_trace_hex_dump(QDF_MODULE_ID_WMA,
-				CDF_TRACE_LEVEL_DEBUG,
+				qdf_trace_hex_dump(QDF_MODULE_ID_WMA,
+				QDF_TRACE_LEVEL_DEBUG,
 				param_buf->wow_packet_buffer, wow_buf_pkt_len);
 		    if (wow_buf_pkt_len >= sizeof(param)) {
 			param.fixed_param = (wmi_peer_sta_kickout_event_fixed_param *)
@@ -3252,11 +3252,11 @@ static QDF_STATUS wma_send_wow_patterns_to_fw(tp_wma_handle wma,
 		 bitmap_pattern->pattern_offset, user);
 
 	WMA_LOGI("Pattern : ");
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO,
 		&bitmap_pattern->patternbuf[0], bitmap_pattern->pattern_len);
 
 	WMA_LOGI("Mask : ");
-	CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO,
 		&bitmap_pattern->bitmaskbuf[0], bitmap_pattern->pattern_len);
 
 	buf_ptr += sizeof(WOW_BITMAP_PATTERN_T);
@@ -3615,10 +3615,10 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle)
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 #else
-			CDF_BUG(0);
+			QDF_BUG(0);
 #endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: LOGP is in progress, ignore!", __func__);
@@ -3643,7 +3643,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle)
 			 wmi_pending_cmds);
 		htc_dump_counter_info(wma->htc_handle);
 		if (!cds_is_driver_recovering())
-			CDF_BUG(0);
+			QDF_BUG(0);
 		else
 			WMA_LOGE("%s: SSR in progress, ignore no credit issue",
 				 __func__);
@@ -3656,7 +3656,7 @@ QDF_STATUS wma_enable_wow_in_fw(WMA_HANDLE handle)
 
 	if (scn == NULL) {
 		WMA_LOGE("%s: Failed to get HIF context", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAULT;
 	}
 
@@ -4306,10 +4306,10 @@ static QDF_STATUS wma_send_host_wakeup_ind_to_fw(tp_wma_handle wma)
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 #else
-			CDF_BUG(0);
+			QDF_BUG(0);
 #endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: SSR in progress, ignore resume timeout",
@@ -4840,9 +4840,9 @@ QDF_STATUS wma_process_tsm_stats_req(tp_wma_handle wma_handler,
 	pTsmRspParams =
 		(tpAniGetTsmStatsRsp) cdf_mem_malloc(sizeof(tAniGetTsmStatsRsp));
 	if (NULL == pTsmRspParams) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "%s: CDF MEM Alloc Failure", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		cdf_mem_free(pTsmStatsMsg);
 		return QDF_STATUS_E_NOMEM;
 	}
@@ -6593,7 +6593,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr)
 			if (pmac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 		} else {
 			WMA_LOGE("%s: LOGP is in progress, ignore!", __func__);
@@ -6606,7 +6606,7 @@ int wma_suspend_target(WMA_HANDLE handle, int disable_target_intr)
 
 	if (scn == NULL) {
 		WMA_LOGE("%s: Failed to get HIF context", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return -EFAULT;
 	}
 
@@ -6691,10 +6691,10 @@ int wma_resume_target(WMA_HANDLE handle)
 			if (pMac->sme.enableSelfRecovery) {
 				cds_trigger_recovery();
 			} else {
-				CDF_BUG(0);
+				QDF_BUG(0);
 			}
 #else
-			CDF_BUG(0);
+			QDF_BUG(0);
 #endif /* CONFIG_CNSS */
 		} else {
 			WMA_LOGE("%s: SSR in progress, ignore resume timeout",
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index 66f3696fc1f3..8c853a4b0d98 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -122,7 +122,7 @@ static void wma_service_ready_ext_evt_timeout(void *data)
 	}
 end:
 	/* Panic so that we can debug why FW is not responding */
-	CDF_BUG(0);
+	QDF_BUG(0);
 }
 
 /**
@@ -2087,7 +2087,7 @@ QDF_STATUS wma_pre_start(void *cds_ctx)
 	qdf_status = cds_mq_post_message(CDS_MQ_ID_WMA, &wma_msg);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		WMA_LOGP("%s: Failed to post WNI_CFG_DNLD_REQ msg", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		qdf_status = QDF_STATUS_E_FAILURE;
 	}
 end:
@@ -2117,7 +2117,7 @@ void wma_send_msg(tp_wma_handle wma_handle, uint16_t msg_type,
 	if (QDF_STATUS_SUCCESS != status) {
 		if (NULL != body_ptr)
 			cdf_mem_free(body_ptr);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 	}
 	return;
 }
@@ -3610,7 +3610,7 @@ static wmi_buf_t wma_setup_wmi_init_msg(tp_wma_handle wma_handle,
 
 	/* allocate memory requested by FW */
 	if (ev->num_mem_reqs > WMI_MAX_MEM_REQS) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		cdf_nbuf_free(buf);
 		return NULL;
 	}
@@ -4148,7 +4148,7 @@ void wma_rx_ready_event(WMA_HANDLE handle, void *cmd_param_info)
 	param_buf = (WMI_READY_EVENTID_param_tlvs *) cmd_param_info;
 	if (!(wma_handle && param_buf)) {
 		WMA_LOGP("%s: Invalid arguments", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -4225,7 +4225,7 @@ void wma_setneedshutdown(void *cds_ctx)
 
 	if (NULL == wma_handle) {
 		WMA_LOGP("%s: Invalid arguments", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return;
 	}
 
@@ -4249,7 +4249,7 @@ bool wma_needshutdown(void *cds_ctx)
 
 	if (NULL == wma_handle) {
 		WMA_LOGP("%s: Invalid arguments", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return false;
 	}
 
@@ -4704,7 +4704,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
 	WMA_LOGI("%s: Enter", __func__);
 	if (NULL == msg) {
 		WMA_LOGE("msg is NULL");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		qdf_status = QDF_STATUS_E_INVAL;
 		goto end;
 	}
@@ -4716,7 +4716,7 @@ QDF_STATUS wma_mc_process_msg(void *cds_context, cds_msg_t *msg)
 
 	if (NULL == wma_handle) {
 		WMA_LOGP("%s: wma_handle is NULL", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		cdf_mem_free(msg->bodyptr);
 		qdf_status = QDF_STATUS_E_INVAL;
 		goto end;
diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c
index fdd319520433..fce66cc66d06 100644
--- a/core/wma/src/wma_mgmt.c
+++ b/core/wma/src/wma_mgmt.c
@@ -2090,7 +2090,7 @@ QDF_STATUS wma_process_update_edca_param_req(WMA_HANDLE handle,
 	if (pdev)
 		ol_txrx_set_wmm_param(pdev, ol_tx_wmm_param);
 	else
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 
 	return QDF_STATUS_SUCCESS;
 
diff --git a/core/wma/src/wma_power.c b/core/wma/src/wma_power.c
index 1326e28e7724..9d9a987cc22b 100644
--- a/core/wma/src/wma_power.c
+++ b/core/wma/src/wma_power.c
@@ -655,7 +655,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma,
 	/* Set Tx/Rx Data InActivity Timeout   */
 	if (wlan_cfg_get_int(mac, WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT,
 			     &cfg_data_val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_PS_DATA_INACTIVITY_TIMEOUT");
 		cfg_data_val = POWERSAVE_DEFAULT_INACTIVITY_TIME;
 	}
@@ -668,7 +668,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma,
 
 		if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL,
 				     &cfg_data_val) != eSIR_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for WNI_CFG_MAX_PS_POLL");
 		}
 		if (cfg_data_val)
@@ -681,7 +681,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma,
 		/* Ps Poll Wake Policy */
 		if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL,
 				     &cfg_data_val) != eSIR_SUCCESS) {
-			CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for WNI_CFG_MAX_PS_POLL");
 		}
 		if (cfg_data_val) {
@@ -771,7 +771,7 @@ static int32_t wma_set_force_sleep(tp_wma_handle wma,
 	/* Set Listen Interval */
 	if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
 			     &cfg_data_val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get value for WNI_CFG_LISTEN_INTERVAL");
 		cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;
 	}
@@ -816,7 +816,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id,
 	/* Get Configured Ps Poll Count */
 	if (wlan_cfg_get_int(mac, WNI_CFG_MAX_PS_POLL,
 			     &cfg_data_val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get value for WNI_CFG_MAX_PS_POLL");
 	}
 	if (cfg_data_val) {
@@ -883,7 +883,7 @@ int32_t wma_set_qpower_force_sleep(tp_wma_handle wma, uint32_t vdev_id,
 	/* Set Listen Interval */
 	if (wlan_cfg_get_int(mac, WNI_CFG_LISTEN_INTERVAL,
 			     &cfg_data_val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get value for WNI_CFG_LISTEN_INTERVAL");
 		cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;
 	}
@@ -2189,7 +2189,7 @@ static void wma_set_vdev_resume_dtim(tp_wma_handle wma, uint8_t vdev_id)
 						       WNI_CFG_LISTEN_INTERVAL,
 						       &cfg_data_val) !=
 				      eSIR_SUCCESS)) {
-			CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+			QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				  "Failed to get value for listen interval");
 			cfg_data_val = POWERSAVE_DEFAULT_LISTEN_INTERVAL;
 		}
diff --git a/core/wma/src/wma_scan_roam.c b/core/wma/src/wma_scan_roam.c
index dc94eba0c8eb..55586707e1ad 100644
--- a/core/wma/src/wma_scan_roam.c
+++ b/core/wma/src/wma_scan_roam.c
@@ -1964,7 +1964,7 @@ QDF_STATUS wma_roam_scan_filter(tp_wma_handle wma_handle,
 			roam_params->ssid_allowed_list[i].length);
 		ssid_ptr->ssid_len = roam_params->ssid_allowed_list[i].length;
 		WMA_LOGD("%s: SSID length=%d", __func__, ssid_ptr->ssid_len);
-		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG,
 				(uint8_t *)ssid_ptr->ssid,
 				ssid_ptr->ssid_len);
 		ssid_ptr++;
@@ -2285,8 +2285,8 @@ QDF_STATUS wma_process_roam_scan_req(tp_wma_handle wma_handle,
 			    cds_mq_post_message(CDS_MQ_ID_SME,
 						(cds_msg_t *) &cds_msg)) {
 				cdf_mem_free(scan_offload_rsp);
-				CDF_TRACE(QDF_MODULE_ID_WMA,
-					  CDF_TRACE_LEVEL_INFO,
+				QDF_TRACE(QDF_MODULE_ID_WMA,
+					  QDF_TRACE_LEVEL_INFO,
 					  "%s: Failed to post Scan Offload Rsp to UMAC",
 					  __func__);
 			}
@@ -2589,13 +2589,13 @@ void wma_fill_roam_synch_buffer(tp_wma_handle wma,
 		cdf_mem_copy(roam_synch_ind_ptr->replay_ctr,
 			     key->replay_counter, SIR_REPLAY_CTR_LEN);
 		WMA_LOGD("%s: KCK dump", __func__);
-		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG,
 				   key->kck, SIR_KCK_KEY_LEN);
 		WMA_LOGD("%s: KEK dump", __func__);
-		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG,
 				   key->kek, SIR_KEK_KEY_LEN);
 		WMA_LOGD("%s: Key Replay Counter dump", __func__);
-		CDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_DEBUG,
+		QDF_TRACE_HEX_DUMP(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_DEBUG,
 				   key->replay_counter, SIR_REPLAY_CTR_LEN);
 	}
 }
@@ -2720,7 +2720,7 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 	if (!roam_synch_ind_ptr) {
 		WMA_LOGE("%s: failed to allocate memory for roam_synch_event",
 			 __func__);
-		CDF_ASSERT(roam_synch_ind_ptr != NULL);
+		QDF_ASSERT(roam_synch_ind_ptr != NULL);
 		return -ENOMEM;
 	}
 	cdf_mem_zero(roam_synch_ind_ptr, len);
@@ -2739,8 +2739,8 @@ int wma_roam_synch_event_handler(void *handle, uint8_t *event,
 	roam_synch_ind_ptr->join_rsp = cdf_mem_malloc(sizeof(tSirSmeJoinRsp));
 	if ((NULL == roam_synch_ind_ptr->join_rsp) || (NULL == bss_desc_ptr)) {
 		WMA_LOGE("LFR3: mem alloc failed!");
-		CDF_ASSERT(bss_desc_ptr != NULL);
-		CDF_ASSERT(roam_synch_ind_ptr->join_rsp != NULL);
+		QDF_ASSERT(bss_desc_ptr != NULL);
+		QDF_ASSERT(roam_synch_ind_ptr->join_rsp != NULL);
 		status =  -ENOMEM;
 		goto cleanup_label;
 	}
@@ -2843,12 +2843,12 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	pMac = cds_get_context(QDF_MODULE_ID_PE);
 	if (!pMac) {
 		WMA_LOGE("%s:NULL pMac ptr. Exiting", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_PRIVACY_ENABLED, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_PRIVACY_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2857,7 +2857,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	if (val)
 		selfCaps.privacy = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_SHORT_PREAMBLE, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_SHORT_PREAMBLE");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2868,28 +2868,28 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	selfCaps.channelAgility = 0;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED,
 			     &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_11G_SHORT_SLOT_TIME_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (val)
 		selfCaps.shortSlotTime = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_11H_ENABLED, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_11H_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (val)
 		selfCaps.spectrumMgt = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_QOS_ENABLED, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_QOS_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (val)
 		selfCaps.qos = 1;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_APSD_ENABLED, &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_APSD_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2900,7 +2900,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_BLOCK_ACK_ENABLED, &val) !=
 	    eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_BLOCK_ACK_ENABLED");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2913,7 +2913,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_HT_CAP_INFO, &nCfgValue) !=
 	    eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_HT_CAP_INFO");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2922,7 +2922,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 		uHTCapabilityInfo.nCfgValue16 & 0xFFFF;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_HT_AMPDU_PARAMS, &nCfgValue) !=
 	    eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_HT_AMPDU_PARAMS");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2934,13 +2934,13 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	if (wlan_cfg_get_str(pMac, WNI_CFG_SUPPORTED_MCS_SET,
 			     (uint8_t *) roam_offload_params->mcsset,
 			     &val) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_SUPPORTED_MCS_SET");
 		return QDF_STATUS_E_FAILURE;
 	}
 	if (wlan_cfg_get_int(pMac, WNI_CFG_EXT_HT_CAP_INFO, &nCfgValue) !=
 	    eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_EXT_HT_CAP_INFO");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2950,7 +2950,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 		uHTCapabilityInfo.nCfgValue16 & 0xFFFF;
 
 	if (wlan_cfg_get_int(pMac, WNI_CFG_TX_BF_CAP, &nCfgValue) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_TX_BF_CAP");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2958,7 +2958,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	nCfgValue8 = (uint8_t) nCfgValue;
 	roam_offload_params->ht_txbf = nCfgValue8 & 0xFF;
 	if (wlan_cfg_get_int(pMac, WNI_CFG_AS_CAP, &nCfgValue) != eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_AS_CAP");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -2969,7 +2969,7 @@ QDF_STATUS wma_roam_scan_fill_self_caps(tp_wma_handle wma_handle,
 	/* QOS Info */
 	if (wlan_cfg_get_int(pMac, WNI_CFG_MAX_SP_LENGTH, &nCfgValue) !=
 	    eSIR_SUCCESS) {
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  "Failed to get WNI_CFG_MAX_SP_LENGTH");
 		return QDF_STATUS_E_FAILURE;
 	}
@@ -6671,13 +6671,13 @@ void wma_roam_better_ap_handler(tp_wma_handle wma, uint32_t vdev_id)
 
 	cds_msg.type = eWNI_SME_CANDIDATE_FOUND_IND;
 	cds_msg.bodyptr = candidate_ind;
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO,
 		  FL("posting candidate ind to SME"));
 
 	if (QDF_STATUS_SUCCESS != cds_mq_post_message(CDS_MQ_ID_SME,
 						(cds_msg_t *) &cds_msg)) {
 		cdf_mem_free(candidate_ind);
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			  FL("Failed to post candidate ind to SME"));
 	}
 }
diff --git a/core/wma/src/wma_utils.c b/core/wma/src/wma_utils.c
index eabec8b36e65..907b50bde005 100644
--- a/core/wma/src/wma_utils.c
+++ b/core/wma/src/wma_utils.c
@@ -413,9 +413,9 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf,
 	buf_ptr = buf_ptr + sizeof(wmi_wlan_profile_ctx_t) + WMI_TLV_HDR_SIZE;
 	profile_data = (wmi_wlan_profile_t *) buf_ptr;
 	entries = profile_ctx->bin_count;
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 				"Profile data stats\n");
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 		"TOT: %d\n"
 		"tx_msdu_cnt: %d\n"
 		"tx_mpdu_cnt: %d\n"
@@ -434,7 +434,7 @@ int wma_profile_data_report_event_handler(void *handle, uint8_t *event_buf,
 	for (i = 0; i < entries; i++) {
 		if (i == WMI_WLAN_PROFILE_MAX_BIN_CNT)
 			break;
-		CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_ERROR,
+		QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_ERROR,
 			"Profile ID: %d\n"
 			"Profile Count: %d\n"
 			"Profile TOT: %d\n"
@@ -1591,7 +1591,7 @@ QDF_STATUS wma_wni_cfg_dnld(tp_wma_handle wma_handle)
 
 	if (NULL == mac) {
 		WMA_LOGP("%s: Invalid context", __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return QDF_STATUS_E_FAILURE;
 	}
 
@@ -2038,7 +2038,7 @@ static tAniGetPEStatsRsp *wma_get_stats_rsp_buf
 	stats_rsp_params = (tAniGetPEStatsRsp *) cdf_mem_malloc(len);
 	if (!stats_rsp_params) {
 		WMA_LOGE("memory allocation failed for tAniGetPEStatsRsp");
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 
diff --git a/core/wmi/wmi_unified.c b/core/wmi/wmi_unified.c
index 59a1fb1180c7..e80a0299a144 100644
--- a/core/wmi/wmi_unified.c
+++ b/core/wmi/wmi_unified.c
@@ -173,7 +173,7 @@ wmi_buf_alloc_debug(wmi_unified_t wmi_handle, uint16_t len, uint8_t *file_name,
 	wmi_buf_t wmi_buf;
 
 	if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 
@@ -206,7 +206,7 @@ wmi_buf_t wmi_buf_alloc(wmi_unified_t wmi_handle, uint16_t len)
 	wmi_buf_t wmi_buf;
 
 	if (roundup(len + WMI_MIN_HEAD_ROOM, 4) > wmi_handle->max_msg_len) {
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return NULL;
 	}
 
@@ -807,7 +807,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len,
 	     (WMI_PDEV_RESUME_CMDID != cmd_id))) {
 		pr_err("%s: Target is suspended  could not send WMI command\n",
 		       __func__);
-		CDF_ASSERT(0);
+		QDF_ASSERT(0);
 		return -EBUSY;
 	}
 
@@ -840,7 +840,7 @@ int wmi_unified_cmd_send(wmi_unified_t wmi_handle, wmi_buf_t buf, int len,
 		htc_dump_counter_info(wmi_handle->htc_handle);
 		qdf_atomic_dec(&wmi_handle->pending_cmds);
 		pr_err("%s: MAX 1024 WMI Pending cmds reached.\n", __func__);
-		CDF_BUG(0);
+		QDF_BUG(0);
 		return -EBUSY;
 	}
 
@@ -1266,7 +1266,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle)
 {
 	wmi_buf_t buf;
 
-	CDF_TRACE(QDF_MODULE_ID_WMI, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_WMI, QDF_TRACE_LEVEL_INFO,
 		"Enter: %s", __func__);
 	cds_flush_work(&wmi_handle->rx_event_work);
 	qdf_spin_lock_bh(&wmi_handle->eventq_lock);
@@ -1276,7 +1276,7 @@ wmi_unified_remove_work(struct wmi_unified *wmi_handle)
 		buf = cdf_nbuf_queue_remove(&wmi_handle->event_queue);
 	}
 	qdf_spin_unlock_bh(&wmi_handle->eventq_lock);
-	CDF_TRACE(QDF_MODULE_ID_WMA, CDF_TRACE_LEVEL_INFO,
+	QDF_TRACE(QDF_MODULE_ID_WMA, QDF_TRACE_LEVEL_INFO,
 		"Done: %s", __func__);
 }
 
diff --git a/uapi/linux/osapi_linux.h b/uapi/linux/osapi_linux.h
index 27f74f2f3662..a62b96d3f613 100644
--- a/uapi/linux/osapi_linux.h
+++ b/uapi/linux/osapi_linux.h
@@ -72,11 +72,11 @@
 #define A_MEMCMP(addr1, addr2, len)     memcmp((addr1), (addr2), (len))
 
 #define A_LOGGER(mask, mod, args ...) \
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_PRINTF(args ...) \
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_PRINTF_LOG(args ...) \
-		CDF_TRACE(QDF_MODULE_ID_QDF, CDF_TRACE_LEVEL_ERROR, ## args)
+		QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR, ## args)
 #define A_SNPRINTF(buf, len, args ...)   snprintf (buf, len, args)
 
 /*