brcmsmac: Use debug macros for general error and debug statements

Convert most uses of wiphy_* and pr_* for general error and debug
messages to use the internal debug macros instead. Most code used only
for initialization still use wiphy_err(), as well as some locations
which are executed too early to use the debug macros. Some debug
messages which are redundant or not useful are removed.

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

1 files changed, 145 insertions, 147 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 1e59ce3c150a..c7e7380a2e43 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -35,6 +35,7 @@
 #include "main.h"
 #include "soc.h"
 #include "dma.h"
+#include "debug.h"
 
 /* watchdog timer, in unit of ms */
 #define TIMER_INTERVAL_WATCHDOG         1000
@@ -640,7 +641,7 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec,
         uint rate = rspec2rate(ratespec);
 
         if (rate == 0) {
-                wiphy_err(wlc->wiphy, "wl%d: WAR: using rate of 1 mbps\n",
+                brcms_err(wlc->hw->d11core, "wl%d: WAR: using rate of 1 mbps\n",
                           wlc->pub->unit);
                 rate = BRCM_RATE_1M;
         }
@@ -710,7 +711,7 @@ static void brcms_c_write_inits(struct brcms_hardware *wlc_hw,
         u16 size;
         u32 value;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
 
         for (i = 0; inits[i].addr != cpu_to_le16(0xffff); i++) {
                 size = le16_to_cpu(inits[i].size);
@@ -739,7 +740,6 @@ static void brcms_c_write_mhf(struct brcms_hardware *wlc_hw, u16 *mhfs)
 
 static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
 {
-        struct wiphy *wiphy = wlc_hw->wlc->wiphy;
         struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
 
         /* init microcode host flags */
@@ -750,8 +750,9 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
                 if (BRCMS_ISNPHY(wlc_hw->band))
                         brcms_c_write_inits(wlc_hw, ucode->d11n0bsinitvals16);
                 else
-                        wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
-                                  " %d\n", __func__, wlc_hw->unit,
+                        brcms_err(wlc_hw->d11core,
+                                  "%s: wl%d: unsupported phy in corerev %d\n",
+                                  __func__, wlc_hw->unit,
                                   wlc_hw->corerev);
         } else {
                 if (D11REV_IS(wlc_hw->corerev, 24)) {
@@ -759,12 +760,14 @@ static void brcms_c_ucode_bsinit(struct brcms_hardware *wlc_hw)
                                 brcms_c_write_inits(wlc_hw,
                                                     ucode->d11lcn0bsinitvals24);
                         else
-                                wiphy_err(wiphy, "%s: wl%d: unsupported phy in"
-                                          " core rev %d\n", __func__,
-                                          wlc_hw->unit, wlc_hw->corerev);
+                                brcms_err(wlc_hw->d11core,
+                                          "%s: wl%d: unsupported phy in core rev %d\n",
+                                          __func__, wlc_hw->unit,
+                                          wlc_hw->corerev);
                 } else {
-                        wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
-                                __func__, wlc_hw->unit, wlc_hw->corerev);
+                        brcms_err(wlc_hw->d11core,
+                                  "%s: wl%d: unsupported corerev %d\n",
+                                  __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         }
 }
@@ -779,7 +782,7 @@ static void brcms_b_core_ioctl(struct brcms_hardware *wlc_hw, u32 m, u32 v)
 
 static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d: clk %d\n", wlc_hw->unit, clk);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d: clk %d\n", wlc_hw->unit, clk);
 
         wlc_hw->phyclk = clk;
 
@@ -898,7 +901,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
 
         if (txs->phyerr) {
                 if (brcm_msg_level & BRCM_DL_INFO) {
-                        wiphy_err(wlc->wiphy, "phyerr 0x%x, rate 0x%x\n",
+                        brcms_err(wlc->hw->d11core, "phyerr 0x%x, rate 0x%x\n",
                                   txs->phyerr, txh->MainRates);
                         brcms_c_print_txdesc(txh);
                 }
@@ -934,7 +937,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
         lastframe = !ieee80211_has_morefrags(h->frame_control);
 
         if (!lastframe) {
-                wiphy_err(wlc->wiphy, "Not last frame!\n");
+                brcms_err(wlc->hw->d11core, "Not last frame!\n");
         } else {
                 /*
                  * Set information to be consumed by Minstrel ht.
@@ -1006,8 +1009,9 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
                 skb_pull(p, D11_TXH_LEN);
                 ieee80211_tx_status_irqsafe(wlc->pub->ieee_hw, p);
         } else {
-                wiphy_err(wlc->wiphy, "%s: Not last frame => not calling "
-                          "tx_status\n", __func__);
+                brcms_err(wlc->hw->d11core,
+                          "%s: Not last frame => not calling tx_status\n",
+                          __func__);
         }
 
         fatal = false;
@@ -1055,8 +1059,8 @@ brcms_b_txstatus(struct brcms_hardware *wlc_hw, bool bound, bool *fatal)
                && (s1 & TXS_V)) {
 
                 if (s1 == 0xffffffff) {
-                        wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n",
-                                wlc_hw->unit, __func__);
+                        brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                                  __func__);
                         return morepending;
                 }
                 s2 = bcma_read32(core, D11REGOFFS(frmtxstatus2));
@@ -1132,7 +1136,6 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
         u16 pio_mhf2 = 0;
         struct brcms_hardware *wlc_hw = wlc->hw;
         uint unit = wlc_hw->unit;
-        struct wiphy *wiphy = wlc->wiphy;
 
         /* name and offsets for dma_attach */
         snprintf(name, sizeof(name), "wl%d", unit);
@@ -1188,8 +1191,9 @@ static bool brcms_b_attach_dmapio(struct brcms_c_info *wlc, uint j, bool wme)
 /* Cleaner to leave this as if with AP defined */
 
                 if (dma_attach_err) {
-                        wiphy_err(wiphy, "wl%d: wlc_attach: dma_attach failed"
-                                  "\n", unit);
+                        brcms_err(wlc_hw->d11core,
+                                  "wl%d: wlc_attach: dma_attach failed\n",
+                                  unit);
                         return false;
                 }
 
@@ -1547,7 +1551,7 @@ brcms_b_write_template_ram(struct brcms_hardware *wlc_hw, int offset, int len,
         __le32 word_le;
         __be32 word_be;
         bool be_bit;
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(core, "wl%d\n", wlc_hw->unit);
 
         bcma_write32(core, D11REGOFFS(tplatewrptr), offset);
 
@@ -1756,8 +1760,6 @@ static void brcms_b_bsinit(struct brcms_c_info *wlc, u16 chanspec)
 /* Perform a soft reset of the PHY PLL */
 void brcms_b_core_phypll_reset(struct brcms_hardware *wlc_hw)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         ai_cc_reg(wlc_hw->sih, offsetof(struct chipcregs, chipcontrol_addr),
                   ~0, 0);
         udelay(1);
@@ -1802,7 +1804,7 @@ void brcms_b_phy_reset(struct brcms_hardware *wlc_hw)
         u32 phy_bw_clkbits;
         bool phy_in_reset = false;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d: reset phy\n", wlc_hw->unit);
 
         if (pih == NULL)
                 return;
@@ -1936,7 +1938,7 @@ static void brcms_c_get_macaddr(struct brcms_hardware *wlc_hw, u8 etheraddr[ETH_
 /* power both the pll and external oscillator on/off */
 static void brcms_b_xtal(struct brcms_hardware *wlc_hw, bool want)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d: want %d\n", wlc_hw->unit, want);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d: want %d\n", wlc_hw->unit, want);
 
         /*
          * dont power down if plldown is false or
@@ -2025,7 +2027,7 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
         if (flags == BRCMS_USE_COREFLAGS)
                 flags = (wlc_hw->band->pi ? wlc_hw->band->core_flags : 0);
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d: core reset\n", wlc_hw->unit);
 
         /* request FAST clock if not on  */
         fastclk = wlc_hw->forcefastclk;
@@ -2036,13 +2038,13 @@ void brcms_b_corereset(struct brcms_hardware *wlc_hw, u32 flags)
         if (bcma_core_is_enabled(wlc_hw->d11core)) {
                 for (i = 0; i < NFIFO; i++)
                         if ((wlc_hw->di[i]) && (!dma_txreset(wlc_hw->di[i])))
-                                wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: "
+                                brcms_err(wlc_hw->d11core, "wl%d: %s: "
                                           "dma_txreset[%d]: cannot stop dma\n",
                                            wlc_hw->unit, __func__, i);
 
                 if ((wlc_hw->di[RX_FIFO])
                     && (!wlc_dma_rxreset(wlc_hw, RX_FIFO)))
-                        wiphy_err(wlc_hw->wlc->wiphy, "wl%d: %s: dma_rxreset"
+                        brcms_err(wlc_hw->d11core, "wl%d: %s: dma_rxreset"
                                   "[%d]: cannot stop dma\n",
                                   wlc_hw->unit, __func__, RX_FIFO);
         }
@@ -2255,7 +2257,7 @@ static void brcms_ucode_write(struct brcms_hardware *wlc_hw,
         uint i;
         uint count;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
 
         count = (nbytes / sizeof(u32));
 
@@ -2283,8 +2285,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
                                           ucode->bcm43xx_16_mimosz);
                         wlc_hw->ucode_loaded = true;
                 } else
-                        wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
-                                  "corerev %d\n",
+                        brcms_err(wlc_hw->d11core,
+                                  "%s: wl%d: unsupported phy in corerev %d\n",
                                   __func__, wlc_hw->unit, wlc_hw->corerev);
         } else if (D11REV_IS(wlc_hw->corerev, 24)) {
                 if (BRCMS_ISLCNPHY(wlc_hw->band)) {
@@ -2292,8 +2294,8 @@ static void brcms_ucode_download(struct brcms_hardware *wlc_hw)
                                           ucode->bcm43xx_24_lcnsz);
                         wlc_hw->ucode_loaded = true;
                 } else {
-                        wiphy_err(wlc->wiphy, "%s: wl%d: unsupported phy in "
-                                  "corerev %d\n",
+                        brcms_err(wlc_hw->d11core,
+                                  "%s: wl%d: unsupported phy in corerev %d\n",
                                   __func__, wlc_hw->unit, wlc_hw->corerev);
                 }
         }
@@ -2330,7 +2332,6 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
         uint unit;
         uint intstatus, idx;
         struct bcma_device *core = wlc_hw->d11core;
-        struct wiphy *wiphy = wlc_hw->wlc->wiphy;
 
         unit = wlc_hw->unit;
 
@@ -2347,35 +2348,35 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
                         unit, idx, intstatus);
 
                 if (intstatus & I_RO) {
-                        wiphy_err(wiphy, "wl%d: fifo %d: receive fifo "
+                        brcms_err(core, "wl%d: fifo %d: receive fifo "
                                   "overflow\n", unit, idx);
                         fatal = true;
                 }
 
                 if (intstatus & I_PC) {
-                        wiphy_err(wiphy, "wl%d: fifo %d: descriptor error\n",
-                                 unit, idx);
+                        brcms_err(core, "wl%d: fifo %d: descriptor error\n",
+                                  unit, idx);
                         fatal = true;
                 }
 
                 if (intstatus & I_PD) {
-                        wiphy_err(wiphy, "wl%d: fifo %d: data error\n", unit,
+                        brcms_err(core, "wl%d: fifo %d: data error\n", unit,
                                   idx);
                         fatal = true;
                 }
 
                 if (intstatus & I_DE) {
-                        wiphy_err(wiphy, "wl%d: fifo %d: descriptor protocol "
+                        brcms_err(core, "wl%d: fifo %d: descriptor protocol "
                                   "error\n", unit, idx);
                         fatal = true;
                 }
 
                 if (intstatus & I_RU)
-                        wiphy_err(wiphy, "wl%d: fifo %d: receive descriptor "
+                        brcms_err(core, "wl%d: fifo %d: receive descriptor "
                                   "underflow\n", idx, unit);
 
                 if (intstatus & I_XU) {
-                        wiphy_err(wiphy, "wl%d: fifo %d: transmit fifo "
+                        brcms_err(core, "wl%d: fifo %d: transmit fifo "
                                   "underflow\n", idx, unit);
                         fatal = true;
                 }
@@ -2625,8 +2626,8 @@ bool brcms_c_isr(struct brcms_c_info *wlc, bool *wantdpc)
         macintstatus = wlc_intstatus(wlc, true);
 
         if (macintstatus == 0xffffffff)
-                wiphy_err(wlc->wiphy, "DEVICEREMOVED detected in the ISR code"
-                          " path\n");
+                brcms_err(wlc_hw->d11core,
+                          "DEVICEREMOVED detected in the ISR code path\n");
 
         /* it is not for us */
         if (macintstatus == 0)
@@ -2646,7 +2647,6 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
         struct brcms_hardware *wlc_hw = wlc->hw;
         struct bcma_device *core = wlc_hw->d11core;
         u32 mc, mi;
-        struct wiphy *wiphy = wlc->wiphy;
 
         BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n", wlc_hw->unit,
                 wlc_hw->band->bandunit);
@@ -2664,7 +2664,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
         mc = bcma_read32(core, D11REGOFFS(maccontrol));
 
         if (mc == 0xffffffff) {
-                wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
                 brcms_down(wlc->wl);
                 return;
@@ -2675,7 +2675,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
 
         mi = bcma_read32(core, D11REGOFFS(macintstatus));
         if (mi == 0xffffffff) {
-                wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
                 brcms_down(wlc->wl);
                 return;
@@ -2688,10 +2688,10 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
                  BRCMS_MAX_MAC_SUSPEND);
 
         if (!(bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD)) {
-                wiphy_err(wiphy, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
+                brcms_err(core, "wl%d: wlc_suspend_mac_and_wait: waited %d uS"
                           " and MI_MACSSPNDD is still not on.\n",
                           wlc_hw->unit, BRCMS_MAX_MAC_SUSPEND);
-                wiphy_err(wiphy, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
+                brcms_err(core, "wl%d: psmdebug 0x%08x, phydebug 0x%08x, "
                           "psm_brc 0x%04x\n", wlc_hw->unit,
                           bcma_read32(core, D11REGOFFS(psmdebug)),
                           bcma_read32(core, D11REGOFFS(phydebug)),
@@ -2700,7 +2700,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc)
 
         mc = bcma_read32(core, D11REGOFFS(maccontrol));
         if (mc == 0xffffffff) {
-                wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
                 brcms_down(wlc->wl);
                 return;
@@ -2760,8 +2760,6 @@ static bool brcms_b_validate_chip_access(struct brcms_hardware *wlc_hw)
         u32 w, val;
         struct wiphy *wiphy = wlc_hw->wlc->wiphy;
 
-        BCMMSG(wiphy, "wl%d\n", wlc_hw->unit);
-
         /* Validate dchip register access */
 
         bcma_write32(core, D11REGOFFS(objaddr), OBJADDR_SHM_SEL | 0);
@@ -2822,7 +2820,7 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
         struct bcma_device *core = wlc_hw->d11core;
         u32 tmp;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(core, "wl%d\n", wlc_hw->unit);
 
         tmp = 0;
 
@@ -2838,8 +2836,8 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
 
                         tmp = bcma_read32(core, D11REGOFFS(clk_ctl_st));
                         if ((tmp & CCS_ERSRC_AVAIL_HT) != CCS_ERSRC_AVAIL_HT)
-                                wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on PHY"
-                                          " PLL failed\n", __func__);
+                                brcms_err(core, "%s: turn on PHY PLL failed\n",
+                                          __func__);
                 } else {
                         bcma_set32(core, D11REGOFFS(clk_ctl_st),
                                    tmp | CCS_ERSRC_REQ_D11PLL |
@@ -2855,8 +2853,8 @@ void brcms_b_core_phypll_ctl(struct brcms_hardware *wlc_hw, bool on)
                              (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
                             !=
                             (CCS_ERSRC_AVAIL_D11PLL | CCS_ERSRC_AVAIL_PHYPLL))
-                                wiphy_err(wlc_hw->wlc->wiphy, "%s: turn on "
-                                          "PHY PLL failed\n", __func__);
+                                brcms_err(core, "%s: turn on PHY PLL failed\n",
+                                          __func__);
                 }
         } else {
                 /*
@@ -2874,7 +2872,7 @@ static void brcms_c_coredisable(struct brcms_hardware *wlc_hw)
 {
         bool dev_gone;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d: disable core\n", wlc_hw->unit);
 
         dev_gone = brcms_deviceremoved(wlc_hw->wlc);
 
@@ -3131,7 +3129,7 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
         /* check for rx fifo 0 overflow */
         delta = (u16) (wlc->core->macstat_snapshot->rxf0ovfl - rxf0ovfl);
         if (delta)
-                wiphy_err(wlc->wiphy, "wl%d: %u rx fifo 0 overflows!\n",
+                brcms_err(wlc->hw->d11core, "wl%d: %u rx fifo 0 overflows!\n",
                           wlc->pub->unit, delta);
 
         /* check for tx fifo underflows */
@@ -3140,8 +3138,9 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
                     (u16) (wlc->core->macstat_snapshot->txfunfl[i] -
                               txfunfl[i]);
                 if (delta)
-                        wiphy_err(wlc->wiphy, "wl%d: %u tx fifo %d underflows!"
-                                  "\n", wlc->pub->unit, delta, i);
+                        brcms_err(wlc->hw->d11core,
+                                  "wl%d: %u tx fifo %d underflows!\n",
+                                  wlc->pub->unit, delta, i);
         }
 #endif                          /* DEBUG */
 
@@ -3154,8 +3153,6 @@ static void brcms_c_statsupd(struct brcms_c_info *wlc)
 
 static void brcms_b_reset(struct brcms_hardware *wlc_hw)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         /* reset the core */
         if (!brcms_deviceremoved(wlc_hw->wlc))
                 brcms_b_corereset(wlc_hw, BRCMS_USE_COREFLAGS);
@@ -3166,7 +3163,7 @@ static void brcms_b_reset(struct brcms_hardware *wlc_hw)
 
 void brcms_c_reset(struct brcms_c_info *wlc)
 {
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
+        brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
 
         /* slurp up hw mac counters before core reset */
         brcms_c_statsupd(wlc);
@@ -3211,10 +3208,9 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         bool fifosz_fixup = false;
         int err = 0;
         u16 buf[NFIFO];
-        struct wiphy *wiphy = wlc->wiphy;
         struct brcms_ucode *ucode = &wlc_hw->wlc->wl->ucode;
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(core, "wl%d: core init\n", wlc_hw->unit);
 
         /* reset PSM */
         brcms_b_mctrl(wlc_hw, ~0, (MCTL_IHR_EN | MCTL_PSM_JMP_0 | MCTL_WAKE));
@@ -3234,7 +3230,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
         SPINWAIT(((bcma_read32(core, D11REGOFFS(macintstatus)) &
                    MI_MACSSPNDD) == 0), 1000 * 1000);
         if ((bcma_read32(core, D11REGOFFS(macintstatus)) & MI_MACSSPNDD) == 0)
-                wiphy_err(wiphy, "wl%d: wlc_coreinit: ucode did not self-"
+                brcms_err(core, "wl%d: wlc_coreinit: ucode did not self-"
                           "suspend!\n", wlc_hw->unit);
 
         brcms_c_gpio_init(wlc);
@@ -3245,18 +3241,18 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
                 if (BRCMS_ISNPHY(wlc_hw->band))
                         brcms_c_write_inits(wlc_hw, ucode->d11n0initvals16);
                 else
-                        wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
+                        brcms_err(core, "%s: wl%d: unsupported phy in corerev"
                                   " %d\n", __func__, wlc_hw->unit,
                                   wlc_hw->corerev);
         } else if (D11REV_IS(wlc_hw->corerev, 24)) {
                 if (BRCMS_ISLCNPHY(wlc_hw->band))
                         brcms_c_write_inits(wlc_hw, ucode->d11lcn0initvals24);
                 else
-                        wiphy_err(wiphy, "%s: wl%d: unsupported phy in corerev"
+                        brcms_err(core, "%s: wl%d: unsupported phy in corerev"
                                   " %d\n", __func__, wlc_hw->unit,
                                   wlc_hw->corerev);
         } else {
-                wiphy_err(wiphy, "%s: wl%d: unsupported corerev %d\n",
+                brcms_err(core, "%s: wl%d: unsupported corerev %d\n",
                           __func__, wlc_hw->unit, wlc_hw->corerev);
         }
 
@@ -3298,7 +3294,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc)
                 err = -1;
         }
         if (err != 0)
-                wiphy_err(wiphy, "wlc_coreinit: txfifo mismatch: ucode size %d"
+                brcms_err(core, "wlc_coreinit: txfifo mismatch: ucode size %d"
                           " driver size %d index %d\n", buf[i],
                           wlc_hw->xmtfifo_sz[i], i);
 
@@ -3381,8 +3377,6 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) {
         bool fastclk;
         struct brcms_c_info *wlc = wlc_hw->wlc;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         /* request FAST clock if not on */
         fastclk = wlc_hw->forcefastclk;
         if (!fastclk)
@@ -3475,7 +3469,7 @@ static void brcms_c_rate_lookup_init(struct brcms_c_info *wlc,
                 rate = (rateset->rates[i] & BRCMS_RATE_MASK);
 
                 if (rate > BRCM_MAXRATE) {
-                        wiphy_err(wlc->wiphy, "brcms_c_rate_lookup_init: "
+                        brcms_err(wlc->hw->d11core, "brcms_c_rate_lookup_init: "
                                   "invalid rate 0x%X in rate set\n",
                                   rateset->rates[i]);
                         continue;
@@ -3551,7 +3545,6 @@ static void brcms_c_bandinit_ordered(struct brcms_c_info *wlc,
         uint parkband;
         uint i, band_order[2];
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
         /*
          * We might have been bandlocked during down and the chip
          * power-cycled (hibernate). Figure out the right band to park on
@@ -3732,8 +3725,8 @@ static void brcms_c_set_ratetable(struct brcms_c_info *wlc)
 /* band-specific init */
 static void brcms_c_bsinit(struct brcms_c_info *wlc)
 {
-        BCMMSG(wlc->wiphy, "wl%d: bandunit %d\n",
-                 wlc->pub->unit, wlc->band->bandunit);
+        brcms_dbg_info(wlc->hw->d11core, "wl%d: bandunit %d\n",
+                       wlc->pub->unit, wlc->band->bandunit);
 
         /* write ucode ACK/CTS rate table */
         brcms_c_set_ratetable(wlc);
@@ -3756,7 +3749,8 @@ brcms_c_duty_cycle_set(struct brcms_c_info *wlc, int duty_cycle, bool isOFDM,
             isOFDM ? M_TX_IDLE_BUSY_RATIO_X_16_OFDM :
             M_TX_IDLE_BUSY_RATIO_X_16_CCK;
         if (duty_cycle > 100 || duty_cycle < 0) {
-                wiphy_err(wlc->wiphy, "wl%d:  duty cycle value off limit\n",
+                brcms_err(wlc->hw->d11core,
+                          "wl%d:  duty cycle value off limit\n",
                           wlc->pub->unit);
                 return -EINVAL;
         }
@@ -3930,7 +3924,7 @@ static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)
         u16 old_chanspec = wlc->chanspec;
 
         if (!brcms_c_valid_chanspec_db(wlc->cmi, chanspec)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: Bad channel %d\n",
+                brcms_err(wlc->hw->d11core, "wl%d: %s: Bad channel %d\n",
                           wlc->pub->unit, __func__, CHSPEC_CHANNEL(chanspec));
                 return;
         }
@@ -3941,8 +3935,8 @@ static void brcms_c_set_chanspec(struct brcms_c_info *wlc, u16 chanspec)
                 if (wlc->band->bandunit != bandunit || wlc->bandinit_pending) {
                         switchband = true;
                         if (wlc->bandlocked) {
-                                wiphy_err(wlc->wiphy, "wl%d: %s: chspec %d "
-                                          "band is locked!\n",
+                                brcms_err(wlc->hw->d11core,
+                                          "wl%d: %s: chspec %d band is locked!\n",
                                           wlc->pub->unit, __func__,
                                           CHSPEC_CHANNEL(chanspec));
                                 return;
@@ -4006,6 +4000,10 @@ void brcms_c_beacon_phytxctl_txant_upd(struct brcms_c_info *wlc,
  */
 void brcms_c_protection_upd(struct brcms_c_info *wlc, uint idx, int val)
 {
+        /*
+         * Cannot use brcms_dbg_* here because this function is called
+         * before wlc is sufficiently initialized.
+         */
         BCMMSG(wlc->wiphy, "idx %d, val %d\n", idx, val);
 
         switch (idx) {
@@ -4078,8 +4076,8 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
 
         /* Only apply params if the core is out of reset and has clocks */
         if (!wlc->clk) {
-                wiphy_err(wlc->wiphy, "wl%d: %s : no-clock\n", wlc->pub->unit,
-                          __func__);
+                brcms_err(wlc->hw->d11core, "wl%d: %s : no-clock\n",
+                          wlc->pub->unit, __func__);
                 return;
         }
 
@@ -4097,7 +4095,7 @@ void brcms_c_wme_setparams(struct brcms_c_info *wlc, u16 aci,
 
         if (acp_shm.aifs < EDCF_AIFSN_MIN
             || acp_shm.aifs > EDCF_AIFSN_MAX) {
-                wiphy_err(wlc->wiphy, "wl%d: edcf_setparams: bad "
+                brcms_err(wlc->hw->d11core, "wl%d: edcf_setparams: bad "
                           "aifs %d\n", wlc->pub->unit, acp_shm.aifs);
         } else {
                 acp_shm.cwmin = params->cw_min;
@@ -4212,8 +4210,8 @@ static void brcms_c_radio_timer(void *arg)
         struct brcms_c_info *wlc = (struct brcms_c_info *) arg;
 
         if (brcms_deviceremoved(wlc)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
-                        __func__);
+                brcms_err(wlc->hw->d11core, "wl%d: %s: dead chip\n",
+                          wlc->pub->unit, __func__);
                 brcms_down(wlc->wl);
                 return;
         }
@@ -4226,8 +4224,6 @@ static void brcms_b_watchdog(struct brcms_c_info *wlc)
 {
         struct brcms_hardware *wlc_hw = wlc->hw;
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         if (!wlc_hw->up)
                 return;
 
@@ -4246,14 +4242,14 @@ static void brcms_b_watchdog(struct brcms_c_info *wlc)
 /* common watchdog code */
 static void brcms_c_watchdog(struct brcms_c_info *wlc)
 {
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
+        brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
 
         if (!wlc->pub->up)
                 return;
 
         if (brcms_deviceremoved(wlc)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: dead chip\n", wlc->pub->unit,
-                          __func__);
+                brcms_err(wlc->hw->d11core, "wl%d: %s: dead chip\n",
+                          wlc->pub->unit, __func__);
                 brcms_down(wlc->wl);
                 return;
         }
@@ -4425,13 +4421,13 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
         struct ssb_sprom *sprom = &core->bus->sprom;
 
         if (core->bus->hosttype == BCMA_HOSTTYPE_PCI)
-                BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
-                       pcidev->vendor,
-                       pcidev->device);
+                brcms_dbg_info(core, "wl%d: vendor 0x%x device 0x%x\n", unit,
+                               pcidev->vendor,
+                               pcidev->device);
         else
-                BCMMSG(wlc->wiphy, "wl%d: vendor 0x%x device 0x%x\n", unit,
-                       core->bus->boardinfo.vendor,
-                       core->bus->boardinfo.type);
+                brcms_dbg_info(core, "wl%d: vendor 0x%x device 0x%x\n", unit,
+                               core->bus->boardinfo.vendor,
+                               core->bus->boardinfo.type);
 
         wme = true;
 
@@ -4703,8 +4699,9 @@ static int brcms_b_attach(struct brcms_c_info *wlc, struct bcma_device *core,
                 goto fail;
         }
 
-        BCMMSG(wlc->wiphy, "deviceid 0x%x nbands %d board 0x%x\n",
-               wlc_hw->deviceid, wlc_hw->_nbands, ai_get_boardtype(wlc_hw->sih));
+        brcms_dbg_info(wlc_hw->d11core, "deviceid 0x%x nbands %d board 0x%x\n",
+                       wlc_hw->deviceid, wlc_hw->_nbands,
+                       ai_get_boardtype(wlc_hw->sih));
 
         return err;
 
@@ -4960,7 +4957,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
         if (wlc_hw->wlc->pub->hw_up)
                 return;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
 
         /*
          * Enable pll and xtal, initialize the power control registers,
@@ -4997,7 +4994,7 @@ static void brcms_b_hw_up(struct brcms_hardware *wlc_hw)
 
 static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
+        brcms_dbg_info(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);
 
         /*
          * Enable pll and xtal, initialize the power control registers,
@@ -5036,8 +5033,6 @@ static int brcms_b_up_prep(struct brcms_hardware *wlc_hw)
 
 static int brcms_b_up_finish(struct brcms_hardware *wlc_hw)
 {
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         wlc_hw->up = true;
         wlc_phy_hw_state_upd(wlc_hw->band->pi, true);
 
@@ -5069,7 +5064,7 @@ int brcms_c_up(struct brcms_c_info *wlc)
 {
         struct ieee80211_channel *ch;
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
+        brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
 
         /* HW is turned off so don't try to access it */
         if (wlc->pub->hw_off || brcms_deviceremoved(wlc))
@@ -5110,8 +5105,8 @@ int brcms_c_up(struct brcms_c_info *wlc)
                                          WL_RADIO_HW_DISABLE);
 
                                 if (bsscfg->enable && bsscfg->BSS)
-                                        wiphy_err(wlc->wiphy, "wl%d: up"
-                                                  ": rfdisable -> "
+                                        brcms_err(wlc->hw->d11core,
+                                                  "wl%d: up: rfdisable -> "
                                                   "bsscfg_disable()\n",
                                                    wlc->pub->unit);
                         }
@@ -5171,8 +5166,6 @@ static int brcms_b_bmac_down_prep(struct brcms_hardware *wlc_hw)
         bool dev_gone;
         uint callbacks = 0;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         if (!wlc_hw->up)
                 return callbacks;
 
@@ -5199,8 +5192,6 @@ static int brcms_b_down_finish(struct brcms_hardware *wlc_hw)
         uint callbacks = 0;
         bool dev_gone;
 
-        BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-
         if (!wlc_hw->up)
                 return callbacks;
 
@@ -5249,12 +5240,13 @@ uint brcms_c_down(struct brcms_c_info *wlc)
         int i;
         bool dev_gone = false;
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
+        brcms_dbg_info(wlc->hw->d11core, "wl%d\n", wlc->pub->unit);
 
         /* check if we are already in the going down path */
         if (wlc->going_down) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: Driver going down so return"
-                          "\n", wlc->pub->unit, __func__);
+                brcms_err(wlc->hw->d11core,
+                          "wl%d: %s: Driver going down so return\n",
+                          wlc->pub->unit, __func__);
                 return 0;
         }
         if (!wlc->pub->up)
@@ -5367,7 +5359,7 @@ int brcms_c_set_gmode(struct brcms_c_info *wlc, u8 gmode, bool config)
 
         default:
                 /* Error */
-                wiphy_err(wlc->wiphy, "wl%d: %s: invalid gmode %d\n",
+                brcms_err(wlc->hw->d11core, "wl%d: %s: invalid gmode %d\n",
                           wlc->pub->unit, __func__, gmode);
                 return -ENOTSUPP;
         }
@@ -6015,7 +6007,7 @@ brcms_c_calc_ba_time(struct brcms_c_info *wlc, u32 rspec,
                      u8 preamble_type)
 {
         BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, "
-                 "preamble_type %d\n", wlc->pub->unit, rspec, preamble_type);
+                "preamble_type %d\n", wlc->pub->unit, rspec, preamble_type);
         /*
          * Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that
          * is less than or equal to the rate of the immediately previous
@@ -6138,7 +6130,7 @@ static bool brcms_c_valid_rate(struct brcms_c_info *wlc, u32 rspec, int band,
                         return true;
  error:
         if (verbose)
-                wiphy_err(wlc->wiphy, "wl%d: valid_rate: rate spec 0x%x "
+                brcms_err(wlc->hw->d11core, "wl%d: valid_rate: rate spec 0x%x "
                           "not in hw_rateset\n", wlc->pub->unit, rspec);
 
         return false;
@@ -6148,6 +6140,7 @@ static u32
 mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
                        u32 int_val)
 {
+        struct bcma_device *core = wlc->hw->d11core;
         u8 stf = (int_val & NRATE_STF_MASK) >> NRATE_STF_SHIFT;
         u8 rate = int_val & NRATE_RATE_MASK;
         u32 rspec;
@@ -6164,7 +6157,7 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
         if ((wlc->pub->_n_enab & SUPPORT_11N) && ismcs) {
                 /* mcs only allowed when nmode */
                 if (stf > PHY_TXC1_MODE_SDM) {
-                        wiphy_err(wlc->wiphy, "wl%d: %s: Invalid stf\n",
+                        brcms_err(core, "wl%d: %s: Invalid stf\n",
                                   wlc->pub->unit, __func__);
                         bcmerror = -EINVAL;
                         goto done;
@@ -6175,8 +6168,8 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
                         if (!CHSPEC_IS40(wlc->home_chanspec) ||
                             ((stf != PHY_TXC1_MODE_SISO)
                              && (stf != PHY_TXC1_MODE_CDD))) {
-                                wiphy_err(wlc->wiphy, "wl%d: %s: Invalid mcs "
-                                          "32\n", wlc->pub->unit, __func__);
+                                brcms_err(core, "wl%d: %s: Invalid mcs 32\n",
+                                          wlc->pub->unit, __func__);
                                 bcmerror = -EINVAL;
                                 goto done;
                         }
@@ -6197,15 +6190,15 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
                         if ((stf > PHY_TXC1_MODE_STBC) ||
                             (!BRCMS_STBC_CAP_PHY(wlc)
                              && (stf == PHY_TXC1_MODE_STBC))) {
-                                wiphy_err(wlc->wiphy, "wl%d: %s: Invalid STBC"
-                                          "\n", wlc->pub->unit, __func__);
+                                brcms_err(core, "wl%d: %s: Invalid STBC\n",
+                                          wlc->pub->unit, __func__);
                                 bcmerror = -EINVAL;
                                 goto done;
                         }
                 }
         } else if (is_ofdm_rate(rate)) {
                 if ((stf != PHY_TXC1_MODE_CDD) && (stf != PHY_TXC1_MODE_SISO)) {
-                        wiphy_err(wlc->wiphy, "wl%d: %s: Invalid OFDM\n",
+                        brcms_err(core, "wl%d: %s: Invalid OFDM\n",
                                   wlc->pub->unit, __func__);
                         bcmerror = -EINVAL;
                         goto done;
@@ -6213,20 +6206,20 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band,
         } else if (is_cck_rate(rate)) {
                 if ((cur_band->bandtype != BRCM_BAND_2G)
                     || (stf != PHY_TXC1_MODE_SISO)) {
-                        wiphy_err(wlc->wiphy, "wl%d: %s: Invalid CCK\n",
+                        brcms_err(core, "wl%d: %s: Invalid CCK\n",
                                   wlc->pub->unit, __func__);
                         bcmerror = -EINVAL;
                         goto done;
                 }
         } else {
-                wiphy_err(wlc->wiphy, "wl%d: %s: Unknown rate type\n",
+                brcms_err(core, "wl%d: %s: Unknown rate type\n",
                           wlc->pub->unit, __func__);
                 bcmerror = -EINVAL;
                 goto done;
         }
         /* make sure multiple antennae are available for non-siso rates */
         if ((stf != PHY_TXC1_MODE_SISO) && (wlc->stf->txstreams == 1)) {
-                wiphy_err(wlc->wiphy, "wl%d: %s: SISO antenna but !SISO "
+                brcms_err(core, "wl%d: %s: SISO antenna but !SISO "
                           "request\n", wlc->pub->unit, __func__);
                 bcmerror = -EINVAL;
                 goto done;
@@ -6295,7 +6288,7 @@ static void brcms_c_cck_plcp_set(struct brcms_c_info *wlc, int rate_500,
                 break;
 
         default:
-                wiphy_err(wlc->wiphy,
+                brcms_err(wlc->hw->d11core,
                           "brcms_c_cck_plcp_set: unsupported rate %d\n",
                           rate_500);
                 rate_500 = BRCM_RATE_1M;
@@ -6428,7 +6421,7 @@ static u16 brcms_c_phytxctl1_calc(struct brcms_c_info *wlc, u32 rspec)
                 bw = rspec_get_bw(rspec);
                 /* 10Mhz is not supported yet */
                 if (bw < PHY_TXC1_BW_20MHZ) {
-                        wiphy_err(wlc->wiphy, "phytxctl1_calc: bw %d is "
+                        brcms_err(wlc->hw->d11core, "phytxctl1_calc: bw %d is "
                                   "not supported yet, set to 20L\n", bw);
                         bw = PHY_TXC1_BW_20MHZ;
                 }
@@ -6455,7 +6448,7 @@ static u16 brcms_c_phytxctl1_calc(struct brcms_c_info *wlc, u32 rspec)
                 /* get the phyctl byte from rate phycfg table */
                 phycfg = brcms_c_rate_legacy_phyctl(rspec2rate(rspec));
                 if (phycfg == -1) {
-                        wiphy_err(wlc->wiphy, "phytxctl1_calc: wrong "
+                        brcms_err(wlc->hw->d11core, "phytxctl1_calc: wrong "
                                   "legacy OFDM/CCK rate\n");
                         phycfg = 0;
                 }
@@ -6535,8 +6528,9 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
         if (tx_info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
                 /* non-AP STA should never use BCMC queue */
                 if (queue == TX_BCMC_FIFO) {
-                        wiphy_err(wlc->wiphy, "wl%d: %s: ASSERT queue == "
-                                  "TX_BCMC!\n", wlc->pub->unit, __func__);
+                        brcms_err(wlc->hw->d11core,
+                                  "wl%d: %s: ASSERT queue == TX_BCMC!\n",
+                                  wlc->pub->unit, __func__);
                         frameid = bcmc_fid_generate(wlc, NULL, txh);
                 } else {
                         /* Increment the counter for first fragment */
@@ -6706,7 +6700,8 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
 
                         if ((txrate[k]->flags & IEEE80211_TX_RC_MCS)
                             && (!is_mcs_rate(rspec[k]))) {
-                                wiphy_err(wlc->wiphy, "wl%d: %s: IEEE80211_TX_"
+                                brcms_err(wlc->hw->d11core,
+                                          "wl%d: %s: IEEE80211_TX_"
                                           "RC_MCS != is_mcs_rate(rspec)\n",
                                           wlc->pub->unit, __func__);
                         }
@@ -7100,14 +7095,16 @@ brcms_c_d11hdrs_mac80211(struct brcms_c_info *wlc, struct ieee80211_hw *hw,
                                         wlc->fragthresh[queue] =
                                             (u16) newfragthresh;
                         } else {
-                                wiphy_err(wlc->wiphy, "wl%d: %s txop invalid "
+                                brcms_err(wlc->hw->d11core,
+                                          "wl%d: %s txop invalid "
                                           "for rate %d\n",
                                           wlc->pub->unit, fifo_names[queue],
                                           rspec2rate(rspec[0]));
                         }
 
                         if (dur > wlc->edcf_txop[ac])
-                                wiphy_err(wlc->wiphy, "wl%d: %s: %s txop "
+                                brcms_err(wlc->hw->d11core,
+                                          "wl%d: %s: %s txop "
                                           "exceeded phylen %d/%d dur %d/%d\n",
                                           wlc->pub->unit, __func__,
                                           fifo_names[queue],
@@ -7140,7 +7137,7 @@ static int brcms_c_tx(struct brcms_c_info *wlc, struct sk_buff *skb)
                  * in the tx ring and the tx queue isn't stopped then
                  * we've really got a bug; warn loudly if that happens.
                  */
-                wiphy_warn(wlc->wiphy,
+                brcms_warn(wlc->hw->d11core,
                            "Received frame for tx with no space in DMA ring\n");
                 WARN_ON(!ieee80211_queue_stopped(wlc->pub->ieee_hw,
                                                  skb_get_queue_mapping(skb)));
@@ -7392,7 +7389,8 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
                         rx_status->rate_idx = 11;
                         break;
                 default:
-                        wiphy_err(wlc->wiphy, "%s: Unknown rate\n", __func__);
+                        brcms_err(wlc->hw->d11core,
+                                  "%s: Unknown rate\n", __func__);
                 }
 
                 /*
@@ -7411,7 +7409,7 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
                 } else if (is_ofdm_rate(rspec)) {
                         rx_status->flag |= RX_FLAG_SHORTPRE;
                 } else {
-                        wiphy_err(wlc->wiphy, "%s: Unknown modulation\n",
+                        brcms_err(wlc->hw->d11core, "%s: Unknown modulation\n",
                                   __func__);
                 }
         }
@@ -7421,12 +7419,12 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
 
         if (rxh->RxStatus1 & RXS_DECERR) {
                 rx_status->flag |= RX_FLAG_FAILED_PLCP_CRC;
-                wiphy_err(wlc->wiphy, "%s:  RX_FLAG_FAILED_PLCP_CRC\n",
+                brcms_err(wlc->hw->d11core, "%s:  RX_FLAG_FAILED_PLCP_CRC\n",
                           __func__);
         }
         if (rxh->RxStatus1 & RXS_FCSERR) {
                 rx_status->flag |= RX_FLAG_FAILED_FCS_CRC;
-                wiphy_err(wlc->wiphy, "%s:  RX_FLAG_FAILED_FCS_CRC\n",
+                brcms_err(wlc->hw->d11core, "%s:  RX_FLAG_FAILED_FCS_CRC\n",
                           __func__);
         }
 }
@@ -7837,8 +7835,9 @@ static void brcms_c_recv(struct brcms_c_info *wlc, struct sk_buff *p)
         /* MAC inserts 2 pad bytes for a4 headers or QoS or A-MSDU subframes */
         if (rxh->RxStatus1 & RXS_PBPRES) {
                 if (p->len < 2) {
-                        wiphy_err(wlc->wiphy, "wl%d: recv: rcvd runt of "
-                                  "len %d\n", wlc->pub->unit, p->len);
+                        brcms_err(wlc->hw->d11core,
+                                  "wl%d: recv: rcvd runt of len %d\n",
+                                  wlc->pub->unit, p->len);
                         goto toss;
                 }
                 skb_pull(p, 2);
@@ -7934,10 +7933,9 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
         u32 macintstatus;
         struct brcms_hardware *wlc_hw = wlc->hw;
         struct bcma_device *core = wlc_hw->d11core;
-        struct wiphy *wiphy = wlc->wiphy;
 
         if (brcms_deviceremoved(wlc)) {
-                wiphy_err(wiphy, "wl%d: %s: dead chip\n", wlc_hw->unit,
+                brcms_err(core, "wl%d: %s: dead chip\n", wlc_hw->unit,
                           __func__);
                 brcms_down(wlc->wl);
                 return false;
@@ -7958,7 +7956,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                 if (brcms_b_txstatus(wlc->hw, bounded, &fatal))
                         wlc->macintstatus |= MI_TFS;
                 if (fatal) {
-                        wiphy_err(wiphy, "MI_TFS: fatal\n");
+                        brcms_err(core, "MI_TFS: fatal\n");
                         goto fatal;
                 }
         }
@@ -7968,7 +7966,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
 
         /* ATIM window end */
         if (macintstatus & MI_ATIMWINEND) {
-                BCMMSG(wlc->wiphy, "end of ATIM window\n");
+                brcms_dbg_info(core, "end of ATIM window\n");
                 bcma_set32(core, D11REGOFFS(maccommand), wlc->qvalid);
                 wlc->qvalid = 0;
         }
@@ -7986,7 +7984,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                 wlc_phy_noise_sample_intr(wlc_hw->band->pi);
 
         if (macintstatus & MI_GP0) {
-                wiphy_err(wiphy, "wl%d: PSM microcode watchdog fired at %d "
+                brcms_err(core, "wl%d: PSM microcode watchdog fired at %d "
                           "(seconds). Resetting.\n", wlc_hw->unit, wlc_hw->now);
 
                 printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
@@ -8000,8 +7998,8 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
                 bcma_write32(core, D11REGOFFS(gptimer), 0);
 
         if (macintstatus & MI_RFDISABLE) {
-                BCMMSG(wlc->wiphy, "wl%d: BMAC Detected a change on the"
-                       " RF Disable Input\n", wlc_hw->unit);
+                brcms_dbg_info(core, "wl%d: BMAC Detected a change on the"
+                               " RF Disable Input\n", wlc_hw->unit);
                 brcms_rfkill_set_hw_state(wlc->wl);
         }
 
@@ -8019,7 +8017,7 @@ void brcms_c_init(struct brcms_c_info *wlc, bool mute_tx)
         struct ieee80211_channel *ch = wlc->pub->ieee_hw->conf.channel;
         u16 chanspec;
 
-        BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
+        brcms_dbg_info(core, "wl%d\n", wlc->pub->unit);
 
         chanspec = ch20mhz_chspec(ch->hw_value);