Browse Source

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
Srinivas Girigowda 8 years ago
parent
commit
8a0b665897

+ 1 - 1
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"},
 };

+ 1 - 1
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",

+ 1 - 1
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"},

+ 1 - 1
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"},

+ 1 - 1
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];

+ 1 - 1
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