From 8a0b66589718605884146f11225bcb7ece55a13c Mon Sep 17 00:00:00 2001
From: Srinivas Girigowda <sgirigow@codeaurora.org>
Date: Wed, 19 Oct 2016 16:01:31 -0700
Subject: [PATCH] qcacmn: Replace DEBUG macro with WLAN_DEBUG

This is a qcacld-2.0 to qcacld-3.0 propagation.

pr_debug() should not appear by default in kernel log (kmsg).
DEBUG is a kernel macro, since host driver is using the same name macro,
pr_debug log statements are appearing in kmsg.

Fix this by moving the code under DEBUG to WLAN_DEBUG and
remove DEBUG macro from Kbuild.

Change-Id: I5bb385f91f9b6ba15629a5878625fefc21d4a7e1
CRs-Fixed: 1003261
---
 hif/src/ce/ce_assignment.h         | 2 +-
 hif/src/sdio/native_sdio/src/hif.c | 2 +-
 hif/src/usb/hif_usb.c              | 2 +-
 htc/htc.c                          | 2 +-
 htc/htc_recv.c                     | 2 +-
 qdf/linux/src/i_qdf_trace.h        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hif/src/ce/ce_assignment.h b/hif/src/ce/ce_assignment.h
index 75a0d2c3ba..be7a0501a2 100644
--- a/hif/src/ce/ce_assignment.h
+++ b/hif/src/ce/ce_assignment.h
@@ -42,7 +42,7 @@
 #define HIF_PCI_DEBUG   ATH_DEBUG_MAKE_MODULE_MASK(0)
 #define HIF_PCI_IPA_UC_ASSIGNED_CE  5
 
-#if defined(DEBUG)
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 static ATH_DEBUG_MASK_DESCRIPTION g_hif_debug_description[] = {
 	{HIF_PCI_DEBUG, "hif_pci"},
 };
diff --git a/hif/src/sdio/native_sdio/src/hif.c b/hif/src/sdio/native_sdio/src/hif.c
index 4a813d038a..7c6d071bcd 100644
--- a/hif/src/sdio/native_sdio/src/hif.c
+++ b/hif/src/sdio/native_sdio/src/hif.c
@@ -251,7 +251,7 @@ static QDF_STATUS hif_disable_func(struct hif_sdio_dev *device,
 static QDF_STATUS hif_enable_func(struct hif_sdio_dev *device,
 		   struct sdio_func *func);
 
-#ifdef DEBUG
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 ATH_DEBUG_INSTANTIATE_MODULE_VAR(hif,
 				 "hif",
 				 "(Linux MMC) Host Interconnect Framework",
diff --git a/hif/src/usb/hif_usb.c b/hif/src/usb/hif_usb.c
index 8c1a3e4628..c4035a12ee 100644
--- a/hif/src/usb/hif_usb.c
+++ b/hif/src/usb/hif_usb.c
@@ -38,7 +38,7 @@
 #define ATH_MODULE_NAME hif
 #include <a_debug.h>
 
-#ifdef DEBUG
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 static ATH_DEBUG_MASK_DESCRIPTION g_hif_debug_description[] = {
 	{USB_HIF_DEBUG_CTRL_TRANS, "Control Transfers"},
 	{USB_HIF_DEBUG_BULK_IN, "BULK In Transfers"},
diff --git a/htc/htc.c b/htc/htc.c
index 7fddef41be..63442bddef 100644
--- a/htc/htc.c
+++ b/htc/htc.c
@@ -31,7 +31,7 @@
 #include <qdf_nbuf.h>           /* qdf_nbuf_t */
 #include <qdf_types.h>          /* qdf_print */
 
-#ifdef DEBUG
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 static ATH_DEBUG_MASK_DESCRIPTION g_htc_debug_description[] = {
 	{ATH_DEBUG_SEND, "Send"},
 	{ATH_DEBUG_RECV, "Recv"},
diff --git a/htc/htc_recv.c b/htc/htc_recv.c
index cc466d5142..4e6e6e2b95 100644
--- a/htc/htc_recv.c
+++ b/htc/htc_recv.c
@@ -32,7 +32,7 @@
 /* HTC Control message receive timeout msec */
 #define HTC_CONTROL_RX_TIMEOUT     3000
 
-#ifdef DEBUG
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 void debug_dump_bytes(uint8_t *buffer, uint16_t length, char *pDescription)
 {
 	int8_t stream[60];
diff --git a/qdf/linux/src/i_qdf_trace.h b/qdf/linux/src/i_qdf_trace.h
index 6cd100cbe0..124ebfb2c6 100644
--- a/qdf/linux/src/i_qdf_trace.h
+++ b/qdf/linux/src/i_qdf_trace.h
@@ -53,7 +53,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)
+#if defined(WLAN_DEBUG) || defined(DEBUG)
 #define QDF_TRACE qdf_trace_msg
 #define QDF_TRACE_HEX_DUMP qdf_trace_hex_dump
 #else