brcm80211: Convert log message levels to debug levels

In preparation for enhancements to debug and trace support, convert the
message levels to debug levels which will be used for enabling
categories of debug messages. The two message levels are little-used
anyway and are combined into the BRCM_DL_INFO debug level.

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>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index c62fd3d058b58da8e9c13f8baa161fa871101351..93d4ecddf0be9e3b7891279ee085882249a3e9a9 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -926,7 +926,7 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
                        wiphy_err(wiphy, "%s: ampdu tx phy error (0x%x)\n",
                                  __func__, txs->phyerr);
 
-                       if (brcm_msg_level & LOG_ERROR_VAL) {
+                       if (brcm_msg_level & BRCM_DL_INFO) {
                                brcmu_prpkt("txpkt (AMPDU)", p);
                                brcms_c_print_txdesc((struct d11txh *) p->data);
                        }

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 25c54103ebec853d5923ac1963094675d89d6a36..9c4531db2ca99e88dd12e01ede337e3cbfb5f1e3 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -281,7 +281,7 @@ struct edcf_acparam {
 /* debug/trace */
 uint brcm_msg_level =
 #if defined(DEBUG)
-       LOG_ERROR_VAL;
+       BRCM_DL_INFO;
 #else
        0;
 #endif                         /* DEBUG */
@@ -902,7 +902,7 @@ brcms_c_dotxstatus(struct brcms_c_info *wlc, struct tx_status *txs)
        mcl = le16_to_cpu(txh->MacTxControlLow);
 
        if (txs->phyerr) {
-               if (brcm_msg_level & LOG_ERROR_VAL) {
+               if (brcm_msg_level & BRCM_DL_INFO) {
                        wiphy_err(wlc->wiphy, "phyerr 0x%x, rate 0x%x\n",
                                  txs->phyerr, txh->MainRates);
                        brcms_c_print_txdesc(txh);

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/types.h b/drivers/net/wireless/brcm80211/brcmsmac/types.h
index e3abc0ed502e80b44449b1a65e9c55edabf4e265..ae1f3ad40d459f7722f57a0c40744e1ea58f6f18 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmsmac/types.h
+++ b/drivers/net/wireless/brcm80211/brcmsmac/types.h
@@ -246,7 +246,7 @@
 
 #define BCMMSG(dev, fmt, args...)              \
 do {                                           \
-       if (brcm_msg_level & LOG_TRACE_VAL)     \
+       if (brcm_msg_level & BRCM_DL_INFO)      \
                wiphy_err(dev, "%s: " fmt, __func__, ##args);   \
 } while (0)
 

diff --git a/drivers/net/wireless/brcm80211/include/defs.h b/drivers/net/wireless/brcm80211/include/defs.h
index f0d8c04a9c8cd13b03962b8855acdc69f8913b35..223eb2ba22400180cbf007ebe349ce2f60a58ce2 100644 (file)
--- a/drivers/net/wireless/brcm80211/include/defs.h
+++ b/drivers/net/wireless/brcm80211/include/defs.h
@@ -78,9 +78,8 @@
 #define PM_OFF 0
 #define PM_MAX 1
 
-/* Message levels */
-#define LOG_ERROR_VAL          0x00000001
-#define LOG_TRACE_VAL          0x00000002
+/* Debug levels */
+#define BRCM_DL_INFO           0x00000001
 
 #define PM_OFF 0
 #define PM_MAX 1