brcmsmac: Add brcms_dbg_int() debug macro

Also convert relevant message to use this macro.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Tested-by: Daniel Wagner <wagi@monom.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/debug.h b/drivers/net/wireless/brcm80211/brcmsmac/debug.h
index b9791288ec37..1114833464cd 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/debug.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/debug.h
@@ -39,5 +39,6 @@ static inline void __brcms_dbg(struct device *dev, u32 level,
 #define brcms_dbg_mac80211(core, f, a...)       brcms_dbg(core, BRCM_DL_MAC80211, f, ##a)
 #define brcms_dbg_rx(core, f, a...)             brcms_dbg(core, BRCM_DL_RX, f, ##a)
 #define brcms_dbg_tx(core, f, a...)             brcms_dbg(core, BRCM_DL_TX, f, ##a)
+#define brcms_dbg_int(core, f, a...)            brcms_dbg(core, BRCM_DL_INT, f, ##a)
 
 #endif /* _BRCMS_DEBUG_H_ */
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 304ad55d3809..bfd796e69a81 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -2343,8 +2343,8 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
                 if (!intstatus)
                         continue;
 
-                BCMMSG(wlc_hw->wlc->wiphy, "wl%d: intstatus%d 0x%x\n",
-                        unit, idx, intstatus);
+                brcms_dbg_int(core, "wl%d: intstatus%d 0x%x\n",
+                              unit, idx, intstatus);
 
                 if (intstatus & I_RO) {
                         brcms_err(core, "wl%d: fifo %d: receive fifo "
@@ -2541,8 +2541,8 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr)
         /* macintstatus includes a DMA interrupt summary bit */
         macintstatus = bcma_read32(core, D11REGOFFS(macintstatus));
 
-        BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
-                 macintstatus);
+        brcms_dbg_int(core, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,
+                      macintstatus);
 
         /* detect cardbus removed, in power down(suspend) and in reset */
         if (brcms_deviceremoved(wlc))
@@ -7950,8 +7950,8 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
         macintstatus = wlc->macintstatus;
         wlc->macintstatus = 0;
 
-        BCMMSG(wlc->wiphy, "wl%d: macintstatus 0x%x\n",
-               wlc_hw->unit, macintstatus);
+        brcms_dbg_int(core, "wl%d: macintstatus 0x%x\n",
+                      wlc_hw->unit, macintstatus);
 
         WARN_ON(macintstatus & MI_PRQ); /* PRQ Interrupt in non-MBSS */
 
diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h
index 9206d2c36831..12dd33fb985f 100644
--- a/drivers/net/wireless/brcm80211/include/defs.h
+++ b/drivers/net/wireless/brcm80211/include/defs.h
@@ -83,6 +83,7 @@
 #define BRCM_DL_MAC80211        0x00000002
 #define BRCM_DL_RX              0x00000004
 #define BRCM_DL_TX              0x00000008
+#define BRCM_DL_INT             0x00000010
 
 #define PM_OFF  0
 #define PM_MAX  1