diff --git a/qdf/inc/qdf_lock.h b/qdf/inc/qdf_lock.h
index 7742dc2b20..9a3865d42d 100644
--- a/qdf/inc/qdf_lock.h
+++ b/qdf/inc/qdf_lock.h
@@ -260,8 +260,9 @@ QDF_STATUS qdf_wake_lock_create(qdf_wake_lock_t *lock, const char *name);
 
 QDF_STATUS qdf_wake_lock_acquire(qdf_wake_lock_t *lock, uint32_t reason);
 
+const char *qdf_wake_lock_name(qdf_wake_lock_t *lock);
 QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock,
-					 uint32_t msec, uint32_t reason);
+					 uint32_t msec);
 
 QDF_STATUS qdf_wake_lock_release(qdf_wake_lock_t *lock, uint32_t reason);
 
diff --git a/qdf/inc/qdf_types.h b/qdf/inc/qdf_types.h
index d706a6539d..71f94e438b 100644
--- a/qdf/inc/qdf_types.h
+++ b/qdf/inc/qdf_types.h
@@ -387,6 +387,9 @@ typedef enum {
 typedef void *v_CONTEXT_t;
 
 #define QDF_MAC_ADDR_SIZE (6)
+#define QDF_MAC_ADDRESS_STR "%02x:%02x:%02x:%02x:%02x:%02x"
+#define QDF_MAC_ADDR_ARRAY(a) \
+	(a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
 
 /**
  * struct qdf_mac_addr - mac address array
diff --git a/qdf/linux/src/qdf_lock.c b/qdf/linux/src/qdf_lock.c
index 0ed7016533..68ddea2b98 100644
--- a/qdf/linux/src/qdf_lock.c
+++ b/qdf/linux/src/qdf_lock.c
@@ -32,8 +32,8 @@
 #include <qdf_types.h>
 #ifdef CONFIG_MCL
 #include <i_host_diag_core_event.h>
-#include <ani_global.h>
 #include <hif.h>
+#include <cds_api.h>
 #endif
 #include <i_qdf_lock.h>
 
@@ -244,7 +244,7 @@ EXPORT_SYMBOL(qdf_mutex_release);
  *
  * Return: Pointer to the name if it is valid or a default string
  */
-static const char *qdf_wake_lock_name(qdf_wake_lock_t *lock)
+const char *qdf_wake_lock_name(qdf_wake_lock_t *lock)
 {
 	if (lock->name)
 		return lock->name;
@@ -298,20 +298,11 @@ EXPORT_SYMBOL(qdf_wake_lock_acquire);
  * QDF status success: if wake lock is acquired
  * QDF status failure: if wake lock was not acquired
  */
-QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec,
-					 uint32_t reason)
+QDF_STATUS qdf_wake_lock_timeout_acquire(qdf_wake_lock_t *lock, uint32_t msec)
 {
 	/* Wakelock for Rx is frequent.
 	 * It is reported only during active debug
 	 */
-#ifdef CONFIG_MCL
-	if (((cds_get_ring_log_level(RING_ID_WAKELOCK) >= WLAN_LOG_LEVEL_ACTIVE)
-			&& (WIFI_POWER_EVENT_WAKELOCK_HOLD_RX == reason)) ||
-			(WIFI_POWER_EVENT_WAKELOCK_HOLD_RX != reason)) {
-		host_diag_log_wlock(reason, qdf_wake_lock_name(lock), msec,
-				WIFI_POWER_EVENT_WAKELOCK_TAKEN);
-	}
-#endif
 	__pm_wakeup_event(lock, msec);
 	return QDF_STATUS_SUCCESS;
 }
diff --git a/qdf/linux/src/qdf_trace.c b/qdf/linux/src/qdf_trace.c
index d713f53560..e1d2bbefd2 100644
--- a/qdf/linux/src/qdf_trace.c
+++ b/qdf/linux/src/qdf_trace.c
@@ -33,7 +33,6 @@
 
 /* Include Files */
 #include <qdf_trace.h>
-#include <ani_global.h>
 #include <wlan_logging_sock_svc.h>
 #include "qdf_time.h"
 /* Preprocessor definitions and constants */
@@ -1306,10 +1305,11 @@ void qdf_dp_display_proto_pkt(struct qdf_dp_trace_record_s *record,
 	qdf_print("DPT: %04d: %012llu: %s vdev_id %d", index,
 		record->time, qdf_dp_code_to_string(record->code),
 		buf->vdev_id);
-	qdf_print("DPT: SA: " MAC_ADDRESS_STR " %s DA: "
-		  MAC_ADDRESS_STR " Type %s Subtype %s",
-		MAC_ADDR_ARRAY(buf->sa.bytes), qdf_dp_dir_to_str(buf->dir),
-		MAC_ADDR_ARRAY(buf->da.bytes), qdf_dp_type_to_str(buf->type),
+	qdf_print("DPT: SA: " QDF_MAC_ADDRESS_STR " %s DA: "
+		  QDF_MAC_ADDRESS_STR " Type %s Subtype %s",
+		QDF_MAC_ADDR_ARRAY(buf->sa.bytes), qdf_dp_dir_to_str(buf->dir),
+		QDF_MAC_ADDR_ARRAY(buf->da.bytes),
+		qdf_dp_type_to_str(buf->type),
 		qdf_dp_subtype_to_str(buf->subtype));
 }
 EXPORT_SYMBOL(qdf_dp_display_proto_pkt);