[PATCH 2/2] wcn36xx: add debug_mask to wcn36xx_dbg_dump()

[Kalle Valo]

Uses the same debug mask values as wcn36xx_dbg()

Signed-off-by: Kalle Valo <kvalo at qca.qualcomm.com>
---
 dxe.c     |   13 +++++++++----
 smd.c     |    4 ++--
 txrx.c    |    3 ++-
 wcn36xx.h |   14 ++++++--------
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/dxe.c b/dxe.c
index f8ece18..0f90859 100644
--- a/dxe.c
+++ b/dxe.c
@@ -425,8 +425,11 @@ int wcn36xx_dxe_tx(struct wcn36xx *wcn, struct sk_buff *skb, u8 broadcast, bool
 
 	wcn36xx_dbg(WCN36XX_DBG_DXE, "DXE TX");
 
-	wcn36xx_dbg_dump("DESC1 >>> ", (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
-	wcn36xx_dbg_dump("BD   >>> ", (char*)mem_pool->virt_addr, sizeof(struct wcn36xx_tx_bd));
+	wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "DESC1 >>> ",
+			 (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
+	wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP,
+			 "BD   >>> ", (char*)mem_pool->virt_addr,
+			 sizeof(struct wcn36xx_tx_bd));
 
 	// Set source address of the SKB we send
 	cur_dxe_ctl = (struct wcn36xx_dxe_ctl*)cur_dxe_ctl->next;
@@ -443,8 +446,10 @@ int wcn36xx_dxe_tx(struct wcn36xx *wcn, struct sk_buff *skb, u8 broadcast, bool
 	// set it to VALID
 	cur_dxe_desc->desc_ctl.ctrl = cur_ch->ctrl_skb;
 
-	wcn36xx_dbg_dump("DESC2 >>> ", (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
-	wcn36xx_dbg_dump("SKB   >>> ", (char*)cur_dxe_ctl->skb->data, cur_dxe_ctl->skb->len);
+	wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "DESC2 >>> ",
+			 (char*)cur_dxe_desc, sizeof(*cur_dxe_desc));
+	wcn36xx_dbg_dump(WCN36XX_DBG_DXE_DUMP, "SKB   >>> ",
+			 (char*)cur_dxe_ctl->skb->data, cur_dxe_ctl->skb->len);
 
 	// Move the head of the ring to the next empty descriptor
 	 cur_ch->head_blk_ctl = cur_dxe_ctl->next;
diff --git a/smd.c b/smd.c
index 4c7a9fb..9ead3b4 100644
--- a/smd.c
+++ b/smd.c
@@ -23,7 +23,7 @@ int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
 	init_completion(&wcn->smd_compl);
 	avail = smd_write_avail(wcn->smd_ch);
 
-	wcn36xx_dbg_dump("SMD >>> ", wcn->smd_buf, len);
+	wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "SMD >>> ", wcn->smd_buf, len);
 	if (avail >= len) {
 		avail = smd_write(wcn->smd_ch, wcn->smd_buf, len);
 		if (avail != len) {
@@ -527,7 +527,7 @@ static void wcn36xx_smd_rsp_process (void *buf, size_t len)
 {
 	struct wcn36xx_fw_msg_header * msg_header = buf;
 
-	wcn36xx_dbg_dump("SMD <<< ", buf, len);
+	wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "SMD <<< ", buf, len);
 	switch (msg_header->msg_type) {
 	case WCN36XX_FW_MSG_TYPE_START_RSP:
 		wcn36xx_smd_start_rsp(buf, len);
diff --git a/txrx.c b/txrx.c
index 9f771e9..d17c668 100644
--- a/txrx.c
+++ b/txrx.c
@@ -39,7 +39,8 @@ int  wcn36xx_rx_skb(struct wcn36xx *wcn, struct sk_buff *skb)
 	status.rx_flags = 0;
 	memcpy(skb2->cb, &status, sizeof(struct ieee80211_rx_status));
 	wcn36xx_dbg(WCN36XX_DBG_RX, "RX");
-	wcn36xx_dbg_dump("SKB <<< ", (char*)skb2->data, skb2->len);
+	wcn36xx_dbg_dump(WCN36XX_DBG_RX_DUMP, "SKB <<< ",
+			 (char*)skb2->data, skb2->len);
 	ieee80211_rx_ni(wcn->hw, skb2);
 
 	return 0;
diff --git a/wcn36xx.h b/wcn36xx.h
index d2ee631..4a3e941 100644
--- a/wcn36xx.h
+++ b/wcn36xx.h
@@ -55,14 +55,12 @@ enum wcn36xx_debug_mask {
 	if (debug_mask & mask)				\
 		pr_debug(DRIVER_PREFIX fmt "\n", ##arg)
 
-#define wcn36xx_dbg_dump(prefix_str, buf, len)			\
-do {									\
-	DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, prefix_str);		\
-	if (unlikely(descriptor.flags & _DPRINTK_FLAGS_PRINT))		\
-		print_hex_dump(KERN_DEBUG, prefix_str,			\
-			       DUMP_PREFIX_ADDRESS, 32, 1,		\
-			       buf, len, false);			\
-} while (0)
+#define wcn36xx_dbg_dump(mask, prefix_str, buf, len)		\
+	if (debug_mask & mask)					\
+		print_hex_dump(KERN_DEBUG, prefix_str,		\
+			       DUMP_PREFIX_ADDRESS, 32, 1,	\
+			       buf, len, false);
+
 
 #define ENTER() pr_info(DRIVER_PREFIX "%s\n", __func__)
 
-- 
1.7.9.5