brcm80211: Convert printk(KERN_DEBUG to pr_debug

Use pr_debug to allow dynamic debugging to work. Move an #endif to allow brcmf_dbg_hex_dump to be outside the #if/#endif block. Move a const char* declaration to be inside a pr_debug so the function doesn't need a #if/#endif block. Don't use temporaries in debugging functions so the code can be optimized away. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>

brcm80211: Convert printk(KERN_DEBUG to pr_debug
Use pr_debug to allow dynamic debugging to work. Move an #endif to allow brcmf_dbg_hex_dump to be outside the #if/#endif block. Move a const char* declaration to be inside a pr_debug so the function doesn't need a #if/#endif block. Don't use temporaries in debugging functions so the code can be optimized away. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Joe Perches · John W. Linville
1 parent 8fb1eb8b22
Showing 6 changed files with 78 additions and 93 deletions Side-by-side Diff
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/brcm80211/brcmsmac/main.h
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -399,10 +399,10 @@
 		p = (char *)&buf[sizeof(struct msgtrace_hdr)];
 		while ((s = strstr(p, "\n")) != NULL) {
 			*s = '\0';
-			printk(KERN_DEBUG"%s\n", p);
+			pr_debug("%s\n", p);
 			p = s + 1;
 		}
-		printk(KERN_DEBUG "%s\n", p);
+		pr_debug("%s\n", p);
  
 		/* Reset datalen to avoid display below */
 		datalen = 0;
@@ -2137,6 +2137,7 @@
  
 #ifdef DEBUG
 	tx_packets[pkt->priority]++;
+#endif
  
 	brcmf_dbg_hex_dump(BRCMF_BYTES_ON() &&
 			   ((BRCMF_CTL_ON() && chan == SDPCM_CONTROL_CHANNEL) ||
@@ -2149,7 +2150,6 @@
 			       chan != SDPCM_CONTROL_CHANNEL))) &&
 			   BRCMF_HDRS_ON(),
 			   frame, min_t(u16, len, 16), "TxHdr:\n");
-#endif
  
 	/* Raise len to next SDIO block to eliminate tail command */
 	if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
@@ -2806,7 +2806,7 @@
 			if (line[n - 1] == '\r')
 				n--;
 			line[n] = 0;
-			printk(KERN_DEBUG "CONSOLE: %s\n", line);
+			pr_debug("CONSOLE: %s\n", line);
 		}
 	}
 break2:
@@ -3676,11 +3676,8 @@
 	if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, SI_ENUM_BASE))
 		brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
  
-#ifdef DEBUG
-	printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n",
-	       brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
-
-#endif				/* DEBUG */
+	pr_debug("F1 signature read @0x18000000=0x%4x\n",
+		 brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
  
 	/*
 	 * Force PLL off until brcmf_sdio_chip_attach()
@@ -5765,56 +5765,43 @@
 	return -ENODATA;
 }
  
-#ifdef DEBUG
-static const char * const supr_reason[] = {
-	"None", "PMQ Entry", "Flush request",
-	"Previous frag failure", "Channel mismatch",
-	"Lifetime Expiry", "Underflow"
-};
-
-static void brcms_c_print_txs_status(u16 s)
-{
-	printk(KERN_DEBUG "[15:12]  %d  frame attempts\n",
-	       (s & TX_STATUS_FRM_RTX_MASK) >> TX_STATUS_FRM_RTX_SHIFT);
-	printk(KERN_DEBUG " [11:8]  %d  rts attempts\n",
-	       (s & TX_STATUS_RTS_RTX_MASK) >> TX_STATUS_RTS_RTX_SHIFT);
-	printk(KERN_DEBUG "    [7]  %d  PM mode indicated\n",
-	       ((s & TX_STATUS_PMINDCTD) ? 1 : 0));
-	printk(KERN_DEBUG "    [6]  %d  intermediate status\n",
-	       ((s & TX_STATUS_INTERMEDIATE) ? 1 : 0));
-	printk(KERN_DEBUG "    [5]  %d  AMPDU\n",
-	       (s & TX_STATUS_AMPDU) ? 1 : 0);
-	printk(KERN_DEBUG "  [4:2]  %d  Frame Suppressed Reason (%s)\n",
-	       ((s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT),
-	       supr_reason[(s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT]);
-	printk(KERN_DEBUG "    [1]  %d  acked\n",
-	       ((s & TX_STATUS_ACK_RCV) ? 1 : 0));
-}
-#endif				/* DEBUG */
-
 void brcms_c_print_txstatus(struct tx_status *txs)
 {
-#if defined(DEBUG)
-	u16 s = txs->status;
-	u16 ackphyrxsh = txs->ackphyrxsh;
+	pr_debug("\ntxpkt (MPDU) Complete\n");
  
-	printk(KERN_DEBUG "\ntxpkt (MPDU) Complete\n");
+	pr_debug("FrameID: %04x   TxStatus: %04x\n", txs->frameid, txs->status);
  
-	printk(KERN_DEBUG "FrameID: %04x   ", txs->frameid);
-	printk(KERN_DEBUG "TxStatus: %04x", s);
-	printk(KERN_DEBUG "\n");
+	pr_debug("[15:12]  %d  frame attempts\n",
+		  (txs->status & TX_STATUS_FRM_RTX_MASK) >>
+		 TX_STATUS_FRM_RTX_SHIFT);
+	pr_debug(" [11:8]  %d  rts attempts\n",
+		 (txs->status & TX_STATUS_RTS_RTX_MASK) >>
+		 TX_STATUS_RTS_RTX_SHIFT);
+	pr_debug("    [7]  %d  PM mode indicated\n",
+		 txs->status & TX_STATUS_PMINDCTD ? 1 : 0);
+	pr_debug("    [6]  %d  intermediate status\n",
+		 txs->status & TX_STATUS_INTERMEDIATE ? 1 : 0);
+	pr_debug("    [5]  %d  AMPDU\n",
+		 txs->status & TX_STATUS_AMPDU ? 1 : 0);
+	pr_debug("  [4:2]  %d  Frame Suppressed Reason (%s)\n",
+		 (txs->status & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT,
+		 (const char *[]) {
+			"None",
+			"PMQ Entry",
+			"Flush request",
+			"Previous frag failure",
+			"Channel mismatch",
+			"Lifetime Expiry",
+			"Underflow"
+		 } [(txs->status & TX_STATUS_SUPR_MASK) >>
+		    TX_STATUS_SUPR_SHIFT]);
+	pr_debug("    [1]  %d  acked\n",
+		 txs->status & TX_STATUS_ACK_RCV ? 1 : 0);
  
-	brcms_c_print_txs_status(s);
-
-	printk(KERN_DEBUG "LastTxTime: %04x ", txs->lasttxtime);
-	printk(KERN_DEBUG "Seq: %04x ", txs->sequence);
-	printk(KERN_DEBUG "PHYTxStatus: %04x ", txs->phyerr);
-	printk(KERN_DEBUG "RxAckRSSI: %04x ",
-	       (ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT);
-	printk(KERN_DEBUG "RxAckSQ: %04x",
-	       (ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
-	printk(KERN_DEBUG "\n");
-#endif				/* defined(DEBUG) */
+	pr_debug("LastTxTime: %04x Seq: %04x PHYTxStatus: %04x RxAckRSSI: %04x RxAckSQ: %04x\n",
+		 txs->lasttxtime, txs->sequence, txs->phyerr,
+		 (txs->ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT,
+		 (txs->ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
 }
  
 bool brcms_c_chipmatch(u16 vendor, u16 device)
  
  
  
  
  
  
  
  
  
@@ -5871,53 +5858,53 @@
 	struct ieee80211_rts rts = txh->rts_frame;
  
 	/* add plcp header along with txh descriptor */
-	printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");
+	pr_debug("Raw TxDesc + plcp header:\n");
 	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
 			     txh, sizeof(struct d11txh) + 48);
  
-	printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl);
-	printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch);
-	printk(KERN_DEBUG "FC: %04x ", mfc);
-	printk(KERN_DEBUG "FES Time: %04x\n", tfest);
-	printk(KERN_DEBUG "PhyCtl: %04x%s ", ptcw,
+	pr_debug("TxCtlLow: %04x ", mtcl);
+	pr_debug("TxCtlHigh: %04x ", mtch);
+	pr_debug("FC: %04x ", mfc);
+	pr_debug("FES Time: %04x\n", tfest);
+	pr_debug("PhyCtl: %04x%s ", ptcw,
 	       (ptcw & PHY_TXC_SHORT_HDR) ? " short" : "");
-	printk(KERN_DEBUG "PhyCtl_1: %04x ", ptcw_1);
-	printk(KERN_DEBUG "PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
-	printk(KERN_DEBUG "PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
-	printk(KERN_DEBUG "PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
-	printk(KERN_DEBUG "MainRates: %04x ", mainrates);
-	printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);
-	printk(KERN_DEBUG "\n");
+	pr_debug("PhyCtl_1: %04x ", ptcw_1);
+	pr_debug("PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
+	pr_debug("PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
+	pr_debug("PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
+	pr_debug("MainRates: %04x ", mainrates);
+	pr_debug("XtraFrameTypes: %04x ", xtraft);
+	pr_debug("\n");
  
 	print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh->IV));
 	print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET,
 			     ra, sizeof(txh->TxFrameRA));
  
-	printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);
+	pr_debug("Fb FES Time: %04x ", tfestfb);
 	print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET,
 			     rtspfb, sizeof(txh->RTSPLCPFallback));
-	printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);
+	pr_debug("RTS DUR: %04x ", rtsdfb);
 	print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET,
 			     fragpfb, sizeof(txh->FragPLCPFallback));
-	printk(KERN_DEBUG "DUR: %04x", fragdfb);
-	printk(KERN_DEBUG "\n");
+	pr_debug("DUR: %04x", fragdfb);
+	pr_debug("\n");
  
-	printk(KERN_DEBUG "MModeLen: %04x ", mmodelen);
-	printk(KERN_DEBUG "MModeFbrLen: %04x\n", mmodefbrlen);
+	pr_debug("MModeLen: %04x ", mmodelen);
+	pr_debug("MModeFbrLen: %04x\n", mmodefbrlen);
  
-	printk(KERN_DEBUG "FrameID:     %04x\n", tfid);
-	printk(KERN_DEBUG "TxStatus:    %04x\n", txs);
+	pr_debug("FrameID:     %04x\n", tfid);
+	pr_debug("TxStatus:    %04x\n", txs);
  
-	printk(KERN_DEBUG "MaxNumMpdu:  %04x\n", mnmpdu);
-	printk(KERN_DEBUG "MaxAggbyte:  %04x\n", mabyte);
-	printk(KERN_DEBUG "MaxAggbyte_fb:  %04x\n", mabyte_f);
-	printk(KERN_DEBUG "MinByte:     %04x\n", mmbyte);
+	pr_debug("MaxNumMpdu:  %04x\n", mnmpdu);
+	pr_debug("MaxAggbyte:  %04x\n", mabyte);
+	pr_debug("MaxAggbyte_fb:  %04x\n", mabyte_f);
+	pr_debug("MinByte:     %04x\n", mmbyte);
  
 	print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET,
 			     rtsph, sizeof(txh->RTSPhyHeader));
 	print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET,
 			     (u8 *)&rts, sizeof(txh->rts_frame));
-	printk(KERN_DEBUG "\n");
+	pr_debug("\n");
 }
 #endif				/* defined(DEBUG) */
  
@@ -5999,7 +5986,7 @@
 		{0, NULL}
 	};
  
-	printk(KERN_DEBUG "Raw RxDesc:\n");
+	pr_debug("Raw RxDesc:\n");
 	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh,
 			     sizeof(struct d11rxhdr));
  
  
  
  
@@ -6007,14 +5994,14 @@
  
 	snprintf(lenbuf, sizeof(lenbuf), "0x%x", len);
  
-	printk(KERN_DEBUG "RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
+	pr_debug("RxFrameSize:     %6s (%d)%s\n", lenbuf, len,
 	       (rxh->PhyRxStatus_0 & PRXS0_SHORTH) ? " short preamble" : "");
-	printk(KERN_DEBUG "RxPHYStatus:     %04x %04x %04x %04x\n",
+	pr_debug("RxPHYStatus:     %04x %04x %04x %04x\n",
 	       phystatus_0, phystatus_1, phystatus_2, phystatus_3);
-	printk(KERN_DEBUG "RxMACStatus:     %x %s\n", macstatus1, flagstr);
-	printk(KERN_DEBUG "RXMACaggtype:    %x\n",
+	pr_debug("RxMACStatus:     %x %s\n", macstatus1, flagstr);
+	pr_debug("RXMACaggtype:    %x\n",
 	       (macstatus2 & RXS_AGGTYPE_MASK));
-	printk(KERN_DEBUG "RxTSFTime:       %04x\n", rxh->RxTSFTime);
+	pr_debug("RxTSFTime:       %04x\n", rxh->RxTSFTime);
 }
 #endif				/* defined(DEBUG) */
  
@@ -651,7 +651,9 @@
 #if defined(DEBUG)
 extern void brcms_c_print_txdesc(struct d11txh *txh);
 #else
-#define brcms_c_print_txdesc(a)
+static inline void brcms_c_print_txdesc(struct d11txh *txh)
+{
+}
 #endif
  
 extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);
@@ -26434,8 +26434,7 @@
 	}
  
 	if (bcmerror != 0) {
-		printk(KERN_DEBUG "%s: Failed, cnt = %d\n", __func__,
-		       cal_retry);
+		pr_debug("%s: Failed, cnt = %d\n", __func__, cal_retry);
  
 		if (cal_retry < CAL_RETRY_CNT) {
 			cal_retry++;
@@ -247,7 +247,7 @@
 	struct sk_buff *p;
  
 	if (msg && (msg[0] != '\0'))
-		printk(KERN_DEBUG "%s:\n", msg);
+		pr_debug("%s:\n", msg);
  
 	for (p = p0; p; p = p->next)
 		print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, p->data, p->len);
...	...	@@ -399,10 +399,10 @@
399	399	p = (char *)&buf[sizeof(struct msgtrace_hdr)];
400	400	while ((s = strstr(p, "\n")) != NULL) {
401	401	*s = '\0';
402		- printk(KERN_DEBUG"%s\n", p);
	402	+ pr_debug("%s\n", p);
403	403	p = s + 1;
404	404	}
405		- printk(KERN_DEBUG "%s\n", p);
	405	+ pr_debug("%s\n", p);
406	406
407	407	/* Reset datalen to avoid display below */
408	408	datalen = 0;
...	...	@@ -2137,6 +2137,7 @@
2137	2137
2138	2138	#ifdef DEBUG
2139	2139	tx_packets[pkt->priority]++;
	2140	+#endif
2140	2141
2141	2142	brcmf_dbg_hex_dump(BRCMF_BYTES_ON() &&
2142	2143	((BRCMF_CTL_ON() && chan == SDPCM_CONTROL_CHANNEL) \|\|
...	...	@@ -2149,7 +2150,6 @@
2149	2150	chan != SDPCM_CONTROL_CHANNEL))) &&
2150	2151	BRCMF_HDRS_ON(),
2151	2152	frame, min_t(u16, len, 16), "TxHdr:\n");
2152		-#endif
2153	2153
2154	2154	/* Raise len to next SDIO block to eliminate tail command */
2155	2155	if (bus->roundup && bus->blocksize && (len > bus->blocksize)) {
...	...	@@ -2806,7 +2806,7 @@
2806	2806	if (line[n - 1] == '\r')
2807	2807	n--;
2808	2808	line[n] = 0;
2809		- printk(KERN_DEBUG "CONSOLE: %s\n", line);
	2809	+ pr_debug("CONSOLE: %s\n", line);
2810	2810	}
2811	2811	}
2812	2812	break2:
...	...	@@ -3676,11 +3676,8 @@
3676	3676	if (brcmf_sdcard_set_sbaddr_window(bus->sdiodev, SI_ENUM_BASE))
3677	3677	brcmf_dbg(ERROR, "FAILED to return to SI_ENUM_BASE\n");
3678	3678
3679		-#ifdef DEBUG
3680		- printk(KERN_DEBUG "F1 signature read @0x18000000=0x%4x\n",
3681		- brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
3682		-
3683		-#endif /* DEBUG */
	3679	+ pr_debug("F1 signature read @0x18000000=0x%4x\n",
	3680	+ brcmf_sdcard_reg_read(bus->sdiodev, SI_ENUM_BASE, 4));
3684	3681
3685	3682	/*
3686	3683	* Force PLL off until brcmf_sdio_chip_attach()
...	...	@@ -5765,56 +5765,43 @@
5765	5765	return -ENODATA;
5766	5766	}
5767	5767
5768		-#ifdef DEBUG
5769		-static const char * const supr_reason[] = {
5770		- "None", "PMQ Entry", "Flush request",
5771		- "Previous frag failure", "Channel mismatch",
5772		- "Lifetime Expiry", "Underflow"
5773		-};
5774		-
5775		-static void brcms_c_print_txs_status(u16 s)
5776		-{
5777		- printk(KERN_DEBUG "[15:12] %d frame attempts\n",
5778		- (s & TX_STATUS_FRM_RTX_MASK) >> TX_STATUS_FRM_RTX_SHIFT);
5779		- printk(KERN_DEBUG " [11:8] %d rts attempts\n",
5780		- (s & TX_STATUS_RTS_RTX_MASK) >> TX_STATUS_RTS_RTX_SHIFT);
5781		- printk(KERN_DEBUG " [7] %d PM mode indicated\n",
5782		- ((s & TX_STATUS_PMINDCTD) ? 1 : 0));
5783		- printk(KERN_DEBUG " [6] %d intermediate status\n",
5784		- ((s & TX_STATUS_INTERMEDIATE) ? 1 : 0));
5785		- printk(KERN_DEBUG " [5] %d AMPDU\n",
5786		- (s & TX_STATUS_AMPDU) ? 1 : 0);
5787		- printk(KERN_DEBUG " [4:2] %d Frame Suppressed Reason (%s)\n",
5788		- ((s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT),
5789		- supr_reason[(s & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT]);
5790		- printk(KERN_DEBUG " [1] %d acked\n",
5791		- ((s & TX_STATUS_ACK_RCV) ? 1 : 0));
5792		-}
5793		-#endif /* DEBUG */
5794		-
5795	5768	void brcms_c_print_txstatus(struct tx_status *txs)
5796	5769	{
5797		-#if defined(DEBUG)
5798		- u16 s = txs->status;
5799		- u16 ackphyrxsh = txs->ackphyrxsh;
	5770	+ pr_debug("\ntxpkt (MPDU) Complete\n");
5800	5771
5801		- printk(KERN_DEBUG "\ntxpkt (MPDU) Complete\n");
	5772	+ pr_debug("FrameID: %04x TxStatus: %04x\n", txs->frameid, txs->status);
5802	5773
5803		- printk(KERN_DEBUG "FrameID: %04x ", txs->frameid);
5804		- printk(KERN_DEBUG "TxStatus: %04x", s);
5805		- printk(KERN_DEBUG "\n");
	5774	+ pr_debug("[15:12] %d frame attempts\n",
	5775	+ (txs->status & TX_STATUS_FRM_RTX_MASK) >>
	5776	+ TX_STATUS_FRM_RTX_SHIFT);
	5777	+ pr_debug(" [11:8] %d rts attempts\n",
	5778	+ (txs->status & TX_STATUS_RTS_RTX_MASK) >>
	5779	+ TX_STATUS_RTS_RTX_SHIFT);
	5780	+ pr_debug(" [7] %d PM mode indicated\n",
	5781	+ txs->status & TX_STATUS_PMINDCTD ? 1 : 0);
	5782	+ pr_debug(" [6] %d intermediate status\n",
	5783	+ txs->status & TX_STATUS_INTERMEDIATE ? 1 : 0);
	5784	+ pr_debug(" [5] %d AMPDU\n",
	5785	+ txs->status & TX_STATUS_AMPDU ? 1 : 0);
	5786	+ pr_debug(" [4:2] %d Frame Suppressed Reason (%s)\n",
	5787	+ (txs->status & TX_STATUS_SUPR_MASK) >> TX_STATUS_SUPR_SHIFT,
	5788	+ (const char *[]) {
	5789	+ "None",
	5790	+ "PMQ Entry",
	5791	+ "Flush request",
	5792	+ "Previous frag failure",
	5793	+ "Channel mismatch",
	5794	+ "Lifetime Expiry",
	5795	+ "Underflow"
	5796	+ } [(txs->status & TX_STATUS_SUPR_MASK) >>
	5797	+ TX_STATUS_SUPR_SHIFT]);
	5798	+ pr_debug(" [1] %d acked\n",
	5799	+ txs->status & TX_STATUS_ACK_RCV ? 1 : 0);
5806	5800
5807		- brcms_c_print_txs_status(s);
5808		-
5809		- printk(KERN_DEBUG "LastTxTime: %04x ", txs->lasttxtime);
5810		- printk(KERN_DEBUG "Seq: %04x ", txs->sequence);
5811		- printk(KERN_DEBUG "PHYTxStatus: %04x ", txs->phyerr);
5812		- printk(KERN_DEBUG "RxAckRSSI: %04x ",
5813		- (ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT);
5814		- printk(KERN_DEBUG "RxAckSQ: %04x",
5815		- (ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
5816		- printk(KERN_DEBUG "\n");
5817		-#endif /* defined(DEBUG) */
	5801	+ pr_debug("LastTxTime: %04x Seq: %04x PHYTxStatus: %04x RxAckRSSI: %04x RxAckSQ: %04x\n",
	5802	+ txs->lasttxtime, txs->sequence, txs->phyerr,
	5803	+ (txs->ackphyrxsh & PRXS1_JSSI_MASK) >> PRXS1_JSSI_SHIFT,
	5804	+ (txs->ackphyrxsh & PRXS1_SQ_MASK) >> PRXS1_SQ_SHIFT);
5818	5805	}
5819	5806
5820	5807	bool brcms_c_chipmatch(u16 vendor, u16 device)
5821	5808
5822	5809
5823	5810
5824	5811
5825	5812
5826	5813
5827	5814
5828	5815
5829	5816
...	...	@@ -5871,53 +5858,53 @@
5871	5858	struct ieee80211_rts rts = txh->rts_frame;
5872	5859
5873	5860	/* add plcp header along with txh descriptor */
5874		- printk(KERN_DEBUG "Raw TxDesc + plcp header:\n");
	5861	+ pr_debug("Raw TxDesc + plcp header:\n");
5875	5862	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET,
5876	5863	txh, sizeof(struct d11txh) + 48);
5877	5864
5878		- printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl);
5879		- printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch);
5880		- printk(KERN_DEBUG "FC: %04x ", mfc);
5881		- printk(KERN_DEBUG "FES Time: %04x\n", tfest);
5882		- printk(KERN_DEBUG "PhyCtl: %04x%s ", ptcw,
	5865	+ pr_debug("TxCtlLow: %04x ", mtcl);
	5866	+ pr_debug("TxCtlHigh: %04x ", mtch);
	5867	+ pr_debug("FC: %04x ", mfc);
	5868	+ pr_debug("FES Time: %04x\n", tfest);
	5869	+ pr_debug("PhyCtl: %04x%s ", ptcw,
5883	5870	(ptcw & PHY_TXC_SHORT_HDR) ? " short" : "");
5884		- printk(KERN_DEBUG "PhyCtl_1: %04x ", ptcw_1);
5885		- printk(KERN_DEBUG "PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
5886		- printk(KERN_DEBUG "PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
5887		- printk(KERN_DEBUG "PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
5888		- printk(KERN_DEBUG "MainRates: %04x ", mainrates);
5889		- printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft);
5890		- printk(KERN_DEBUG "\n");
	5871	+ pr_debug("PhyCtl_1: %04x ", ptcw_1);
	5872	+ pr_debug("PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr);
	5873	+ pr_debug("PhyCtl_1_Rts: %04x ", ptcw_1_Rts);
	5874	+ pr_debug("PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts);
	5875	+ pr_debug("MainRates: %04x ", mainrates);
	5876	+ pr_debug("XtraFrameTypes: %04x ", xtraft);
	5877	+ pr_debug("\n");
5891	5878
5892	5879	print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh->IV));
5893	5880	print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET,
5894	5881	ra, sizeof(txh->TxFrameRA));
5895	5882
5896		- printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb);
	5883	+ pr_debug("Fb FES Time: %04x ", tfestfb);
5897	5884	print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET,
5898	5885	rtspfb, sizeof(txh->RTSPLCPFallback));
5899		- printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb);
	5886	+ pr_debug("RTS DUR: %04x ", rtsdfb);
5900	5887	print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET,
5901	5888	fragpfb, sizeof(txh->FragPLCPFallback));
5902		- printk(KERN_DEBUG "DUR: %04x", fragdfb);
5903		- printk(KERN_DEBUG "\n");
	5889	+ pr_debug("DUR: %04x", fragdfb);
	5890	+ pr_debug("\n");
5904	5891
5905		- printk(KERN_DEBUG "MModeLen: %04x ", mmodelen);
5906		- printk(KERN_DEBUG "MModeFbrLen: %04x\n", mmodefbrlen);
	5892	+ pr_debug("MModeLen: %04x ", mmodelen);
	5893	+ pr_debug("MModeFbrLen: %04x\n", mmodefbrlen);
5907	5894
5908		- printk(KERN_DEBUG "FrameID: %04x\n", tfid);
5909		- printk(KERN_DEBUG "TxStatus: %04x\n", txs);
	5895	+ pr_debug("FrameID: %04x\n", tfid);
	5896	+ pr_debug("TxStatus: %04x\n", txs);
5910	5897
5911		- printk(KERN_DEBUG "MaxNumMpdu: %04x\n", mnmpdu);
5912		- printk(KERN_DEBUG "MaxAggbyte: %04x\n", mabyte);
5913		- printk(KERN_DEBUG "MaxAggbyte_fb: %04x\n", mabyte_f);
5914		- printk(KERN_DEBUG "MinByte: %04x\n", mmbyte);
	5898	+ pr_debug("MaxNumMpdu: %04x\n", mnmpdu);
	5899	+ pr_debug("MaxAggbyte: %04x\n", mabyte);
	5900	+ pr_debug("MaxAggbyte_fb: %04x\n", mabyte_f);
	5901	+ pr_debug("MinByte: %04x\n", mmbyte);
5915	5902
5916	5903	print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET,
5917	5904	rtsph, sizeof(txh->RTSPhyHeader));
5918	5905	print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET,
5919	5906	(u8 *)&rts, sizeof(txh->rts_frame));
5920		- printk(KERN_DEBUG "\n");
	5907	+ pr_debug("\n");
5921	5908	}
5922	5909	#endif /* defined(DEBUG) */
5923	5910
...	...	@@ -5999,7 +5986,7 @@
5999	5986	{0, NULL}
6000	5987	};
6001	5988
6002		- printk(KERN_DEBUG "Raw RxDesc:\n");
	5989	+ pr_debug("Raw RxDesc:\n");
6003	5990	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh,
6004	5991	sizeof(struct d11rxhdr));
6005	5992
6006	5993
6007	5994
6008	5995
...	...	@@ -6007,14 +5994,14 @@
6007	5994
6008	5995	snprintf(lenbuf, sizeof(lenbuf), "0x%x", len);
6009	5996
6010		- printk(KERN_DEBUG "RxFrameSize: %6s (%d)%s\n", lenbuf, len,
	5997	+ pr_debug("RxFrameSize: %6s (%d)%s\n", lenbuf, len,
6011	5998	(rxh->PhyRxStatus_0 & PRXS0_SHORTH) ? " short preamble" : "");
6012		- printk(KERN_DEBUG "RxPHYStatus: %04x %04x %04x %04x\n",
	5999	+ pr_debug("RxPHYStatus: %04x %04x %04x %04x\n",
6013	6000	phystatus_0, phystatus_1, phystatus_2, phystatus_3);
6014		- printk(KERN_DEBUG "RxMACStatus: %x %s\n", macstatus1, flagstr);
6015		- printk(KERN_DEBUG "RXMACaggtype: %x\n",
	6001	+ pr_debug("RxMACStatus: %x %s\n", macstatus1, flagstr);
	6002	+ pr_debug("RXMACaggtype: %x\n",
6016	6003	(macstatus2 & RXS_AGGTYPE_MASK));
6017		- printk(KERN_DEBUG "RxTSFTime: %04x\n", rxh->RxTSFTime);
	6004	+ pr_debug("RxTSFTime: %04x\n", rxh->RxTSFTime);
6018	6005	}
6019	6006	#endif /* defined(DEBUG) */
6020	6007
...	...	@@ -651,7 +651,9 @@
651	651	#if defined(DEBUG)
652	652	extern void brcms_c_print_txdesc(struct d11txh *txh);
653	653	#else
654		-#define brcms_c_print_txdesc(a)
	654	+static inline void brcms_c_print_txdesc(struct d11txh *txh)
	655	+{
	656	+}
655	657	#endif
656	658
657	659	extern int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config);
...	...	@@ -26434,8 +26434,7 @@
26434	26434	}
26435	26435
26436	26436	if (bcmerror != 0) {
26437		- printk(KERN_DEBUG "%s: Failed, cnt = %d\n", __func__,
26438		- cal_retry);
	26437	+ pr_debug("%s: Failed, cnt = %d\n", __func__, cal_retry);
26439	26438
26440	26439	if (cal_retry < CAL_RETRY_CNT) {
26441	26440	cal_retry++;
...	...	@@ -247,7 +247,7 @@
247	247	struct sk_buff *p;
248	248
249	249	if (msg && (msg[0] != '\0'))
250		- printk(KERN_DEBUG "%s:\n", msg);
	250	+ pr_debug("%s:\n", msg);
251	251
252	252	for (p = p0; p; p = p->next)
253	253	print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, p->data, p->len);