From 3dce81780822b049111153d70abb70ca5a3ee453 Mon Sep 17 00:00:00 2001
From: Pavankumar Nandeshwar <pnandesh@codeaurora.org>
Date: Tue, 11 Dec 2018 10:49:49 +0530
Subject: [PATCH] qcacmn: enable qdf prints for QDF_TRACE_PRINT_ENABLE flag

Enable printing of QDF prints for QDF_TRACE_PRINT_ENABLE flag
irrespective of the flags WLAN_DEBUG and DEBUG.

Change-Id: I0b53d1759c3d38321d66bec325b855eb1e48e75a
CRs-Fixed: 2355333
---
 qdf/linux/src/i_qdf_trace.h | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index c5104001b73b..fc09eda2e7b3 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -34,7 +34,6 @@
 #define __printf(a, b)
 #endif
 
-#ifdef CONFIG_MCL
 /* QDF_TRACE is the macro invoked to add trace messages to code.  See the
  * documenation for qdf_trace_msg() for the parameters etc. for this function.
  *
@@ -45,17 +44,7 @@
  * 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) || defined(DEBUG)
-#define QDF_TRACE qdf_trace_msg
-#define QDF_VTRACE qdf_vtrace_msg
-#define QDF_TRACE_HEX_DUMP qdf_trace_hex_dump
-#else
-#define QDF_TRACE(arg ...)
-#define QDF_VTRACE(arg ...)
-#define QDF_TRACE_HEX_DUMP(arg ...)
-#endif
-#else /* CONFIG_MCL */
-
+#if defined(QDF_TRACE_PRINT_ENABLE)
 #define qdf_trace(log_level, args...) \
 		do {	\
 			extern int qdf_dbg_mask; \
@@ -64,14 +53,19 @@
 				printk("\n"); \
 			} \
 		} while (0)
+#endif
 
+#if defined(WLAN_DEBUG) || defined(DEBUG) || defined(QDF_TRACE_PRINT_ENABLE)
 #define QDF_TRACE qdf_trace_msg
-
 #define QDF_VTRACE qdf_vtrace_msg
 #define QDF_TRACE_HEX_DUMP qdf_trace_hex_dump
-#endif /* CONFIG_MCL */
+#else
+#define QDF_TRACE(arg ...)
+#define QDF_VTRACE(arg ...)
+#define QDF_TRACE_HEX_DUMP(arg ...)
+#endif
 
-#if defined(WLAN_DEBUG) || defined(DEBUG)
+#if defined(WLAN_DEBUG) || defined(DEBUG) || defined(QDF_TRACE_PRINT_ENABLE)
 #define QDF_MAX_LOGS_PER_SEC 2
 /**
  * __QDF_TRACE_RATE_LIMITED() - rate limited version of QDF_TRACE