tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Joe Perches and committed by
John W. Linville 18aad4f8 8fb1eb8b

+75 -90
+2 -2
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
··· 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;
+4 -7
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
··· 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) || ··· 2150 2149 chan != SDPCM_CONTROL_CHANNEL))) && 2151 2150 BRCMF_HDRS_ON(), 2152 2151 frame, min_t(u16, len, 16), "TxHdr:\n"); 2153 - #endif 2154 2152 2155 2153 /* Raise len to next SDIO block to eliminate tail command */ 2156 2154 if (bus->roundup && bus->blocksize && (len > bus->blocksize)) { ··· 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 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()
+64 -77
drivers/net/wireless/brcm80211/brcmsmac/main.c
··· 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) ··· 5858 5871 struct ieee80211_rts rts = txh->rts_frame; 5859 5872 5860 5873 /* add plcp header along with txh descriptor */ 5861 - printk(KERN_DEBUG "Raw TxDesc + plcp header:\n"); 5874 + pr_debug("Raw TxDesc + plcp header:\n"); 5862 5875 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, 5863 5876 txh, sizeof(struct d11txh) + 48); 5864 5877 5865 - printk(KERN_DEBUG "TxCtlLow: %04x ", mtcl); 5866 - printk(KERN_DEBUG "TxCtlHigh: %04x ", mtch); 5867 - printk(KERN_DEBUG "FC: %04x ", mfc); 5868 - printk(KERN_DEBUG "FES Time: %04x\n", tfest); 5869 - printk(KERN_DEBUG "PhyCtl: %04x%s ", ptcw, 5878 + pr_debug("TxCtlLow: %04x ", mtcl); 5879 + pr_debug("TxCtlHigh: %04x ", mtch); 5880 + pr_debug("FC: %04x ", mfc); 5881 + pr_debug("FES Time: %04x\n", tfest); 5882 + pr_debug("PhyCtl: %04x%s ", ptcw, 5870 5883 (ptcw & PHY_TXC_SHORT_HDR) ? " short" : ""); 5871 - printk(KERN_DEBUG "PhyCtl_1: %04x ", ptcw_1); 5872 - printk(KERN_DEBUG "PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr); 5873 - printk(KERN_DEBUG "PhyCtl_1_Rts: %04x ", ptcw_1_Rts); 5874 - printk(KERN_DEBUG "PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts); 5875 - printk(KERN_DEBUG "MainRates: %04x ", mainrates); 5876 - printk(KERN_DEBUG "XtraFrameTypes: %04x ", xtraft); 5877 - printk(KERN_DEBUG "\n"); 5884 + pr_debug("PhyCtl_1: %04x ", ptcw_1); 5885 + pr_debug("PhyCtl_1_Fbr: %04x\n", ptcw_1_Fbr); 5886 + pr_debug("PhyCtl_1_Rts: %04x ", ptcw_1_Rts); 5887 + pr_debug("PhyCtl_1_Fbr_Rts: %04x\n", ptcw_1_FbrRts); 5888 + pr_debug("MainRates: %04x ", mainrates); 5889 + pr_debug("XtraFrameTypes: %04x ", xtraft); 5890 + pr_debug("\n"); 5878 5891 5879 5892 print_hex_dump_bytes("SecIV:", DUMP_PREFIX_OFFSET, iv, sizeof(txh->IV)); 5880 5893 print_hex_dump_bytes("RA:", DUMP_PREFIX_OFFSET, 5881 5894 ra, sizeof(txh->TxFrameRA)); 5882 5895 5883 - printk(KERN_DEBUG "Fb FES Time: %04x ", tfestfb); 5896 + pr_debug("Fb FES Time: %04x ", tfestfb); 5884 5897 print_hex_dump_bytes("Fb RTS PLCP:", DUMP_PREFIX_OFFSET, 5885 5898 rtspfb, sizeof(txh->RTSPLCPFallback)); 5886 - printk(KERN_DEBUG "RTS DUR: %04x ", rtsdfb); 5899 + pr_debug("RTS DUR: %04x ", rtsdfb); 5887 5900 print_hex_dump_bytes("PLCP:", DUMP_PREFIX_OFFSET, 5888 5901 fragpfb, sizeof(txh->FragPLCPFallback)); 5889 - printk(KERN_DEBUG "DUR: %04x", fragdfb); 5890 - printk(KERN_DEBUG "\n"); 5902 + pr_debug("DUR: %04x", fragdfb); 5903 + pr_debug("\n"); 5891 5904 5892 - printk(KERN_DEBUG "MModeLen: %04x ", mmodelen); 5893 - printk(KERN_DEBUG "MModeFbrLen: %04x\n", mmodefbrlen); 5905 + pr_debug("MModeLen: %04x ", mmodelen); 5906 + pr_debug("MModeFbrLen: %04x\n", mmodefbrlen); 5894 5907 5895 - printk(KERN_DEBUG "FrameID: %04x\n", tfid); 5896 - printk(KERN_DEBUG "TxStatus: %04x\n", txs); 5908 + pr_debug("FrameID: %04x\n", tfid); 5909 + pr_debug("TxStatus: %04x\n", txs); 5897 5910 5898 - printk(KERN_DEBUG "MaxNumMpdu: %04x\n", mnmpdu); 5899 - printk(KERN_DEBUG "MaxAggbyte: %04x\n", mabyte); 5900 - printk(KERN_DEBUG "MaxAggbyte_fb: %04x\n", mabyte_f); 5901 - printk(KERN_DEBUG "MinByte: %04x\n", mmbyte); 5911 + pr_debug("MaxNumMpdu: %04x\n", mnmpdu); 5912 + pr_debug("MaxAggbyte: %04x\n", mabyte); 5913 + pr_debug("MaxAggbyte_fb: %04x\n", mabyte_f); 5914 + pr_debug("MinByte: %04x\n", mmbyte); 5902 5915 5903 5916 print_hex_dump_bytes("RTS PLCP:", DUMP_PREFIX_OFFSET, 5904 5917 rtsph, sizeof(txh->RTSPhyHeader)); 5905 5918 print_hex_dump_bytes("RTS Frame:", DUMP_PREFIX_OFFSET, 5906 5919 (u8 *)&rts, sizeof(txh->rts_frame)); 5907 - printk(KERN_DEBUG "\n"); 5920 + pr_debug("\n"); 5908 5921 } 5909 5922 #endif /* defined(DEBUG) */ 5910 5923 ··· 5986 5999 {0, NULL} 5987 6000 }; 5988 6001 5989 - printk(KERN_DEBUG "Raw RxDesc:\n"); 6002 + pr_debug("Raw RxDesc:\n"); 5990 6003 print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, rxh, 5991 6004 sizeof(struct d11rxhdr)); 5992 6005 ··· 5994 6007 5995 6008 snprintf(lenbuf, sizeof(lenbuf), "0x%x", len); 5996 6009 5997 - printk(KERN_DEBUG "RxFrameSize: %6s (%d)%s\n", lenbuf, len, 6010 + pr_debug("RxFrameSize: %6s (%d)%s\n", lenbuf, len, 5998 6011 (rxh->PhyRxStatus_0 & PRXS0_SHORTH) ? " short preamble" : ""); 5999 - printk(KERN_DEBUG "RxPHYStatus: %04x %04x %04x %04x\n", 6012 + pr_debug("RxPHYStatus: %04x %04x %04x %04x\n", 6000 6013 phystatus_0, phystatus_1, phystatus_2, phystatus_3); 6001 - printk(KERN_DEBUG "RxMACStatus: %x %s\n", macstatus1, flagstr); 6002 - printk(KERN_DEBUG "RXMACaggtype: %x\n", 6014 + pr_debug("RxMACStatus: %x %s\n", macstatus1, flagstr); 6015 + pr_debug("RXMACaggtype: %x\n", 6003 6016 (macstatus2 & RXS_AGGTYPE_MASK)); 6004 - printk(KERN_DEBUG "RxTSFTime: %04x\n", rxh->RxTSFTime); 6017 + pr_debug("RxTSFTime: %04x\n", rxh->RxTSFTime); 6005 6018 } 6006 6019 #endif /* defined(DEBUG) */ 6007 6020
+3 -1
drivers/net/wireless/brcm80211/brcmsmac/main.h
··· 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);
+1 -2
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
··· 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++;
+1 -1
drivers/net/wireless/brcm80211/brcmutil/utils.c
··· 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);