staging: brcm80211: remove unused macros from dhd_dbg.h

[mv-sheeva.git] / drivers / staging / brcm80211 / brcmfmac / dhd_dbg.h

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h b/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h
index 2cbfb518495956367b58749aee639860261a05f6..4733de79336ad08bdbd06cafed79dbca6fa42ae8 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h
@@ -17,51 +17,39 @@
 #ifndef _dhd_dbg_
 #define _dhd_dbg_
 
-#if defined(DHD_DEBUG)
+#if defined(BCMDBG)
 
 #define DHD_ERROR(args) \
-       do {if ((brcmf_msg_level & DHD_ERROR_VAL) && (net_ratelimit())) \
+       do {if ((brcmf_msg_level & BRCMF_ERROR_VAL) && (net_ratelimit())) \
                printk args; } while (0)
-#define DHD_TRACE(args)                do {if (brcmf_msg_level & DHD_TRACE_VAL) \
+#define DHD_TRACE(args)                do {if (brcmf_msg_level & BRCMF_TRACE_VAL) \
                                        printk args; } while (0)
-#define DHD_INFO(args)         do {if (brcmf_msg_level & DHD_INFO_VAL) \
+#define DHD_INFO(args)         do {if (brcmf_msg_level & BRCMF_INFO_VAL) \
                                        printk args; } while (0)
-#define DHD_DATA(args)         do {if (brcmf_msg_level & DHD_DATA_VAL) \
+#define DHD_DATA(args)         do {if (brcmf_msg_level & BRCMF_DATA_VAL) \
                                        printk args; } while (0)
-#define DHD_CTL(args)          do {if (brcmf_msg_level & DHD_CTL_VAL) \
+#define DHD_CTL(args)          do {if (brcmf_msg_level & BRCMF_CTL_VAL) \
                                        printk args; } while (0)
-#define DHD_TIMER(args)                do {if (brcmf_msg_level & DHD_TIMER_VAL) \
+#define DHD_TIMER(args)                do {if (brcmf_msg_level & BRCMF_TIMER_VAL) \
                                        printk args; } while (0)
-#define DHD_HDRS(args)         do {if (brcmf_msg_level & DHD_HDRS_VAL) \
+#define DHD_HDRS(args)         do {if (brcmf_msg_level & BRCMF_HDRS_VAL) \
                                        printk args; } while (0)
-#define DHD_BYTES(args)                do {if (brcmf_msg_level & DHD_BYTES_VAL) \
+#define DHD_BYTES(args)                do {if (brcmf_msg_level & BRCMF_BYTES_VAL) \
                                        printk args; } while (0)
-#define DHD_INTR(args)         do {if (brcmf_msg_level & DHD_INTR_VAL) \
+#define DHD_INTR(args)         do {if (brcmf_msg_level & BRCMF_INTR_VAL) \
                                        printk args; } while (0)
-#define DHD_GLOM(args)         do {if (brcmf_msg_level & DHD_GLOM_VAL) \
+#define DHD_GLOM(args)         do {if (brcmf_msg_level & BRCMF_GLOM_VAL) \
                                        printk args; } while (0)
-#define DHD_EVENT(args)                do {if (brcmf_msg_level & DHD_EVENT_VAL) \
-                                       printk args; } while (0)
-#define DHD_BTA(args)          do {if (brcmf_msg_level & DHD_BTA_VAL) \
-                                       printk args; } while (0)
-#define DHD_ISCAN(args)                do {if (brcmf_msg_level & DHD_ISCAN_VAL) \
+#define DHD_EVENT(args)                do {if (brcmf_msg_level & BRCMF_EVENT_VAL) \
                                        printk args; } while (0)
 
-#define DHD_ERROR_ON()         (brcmf_msg_level & DHD_ERROR_VAL)
-#define DHD_TRACE_ON()         (brcmf_msg_level & DHD_TRACE_VAL)
-#define DHD_INFO_ON()          (brcmf_msg_level & DHD_INFO_VAL)
-#define DHD_DATA_ON()          (brcmf_msg_level & DHD_DATA_VAL)
-#define DHD_CTL_ON()           (brcmf_msg_level & DHD_CTL_VAL)
-#define DHD_TIMER_ON()         (brcmf_msg_level & DHD_TIMER_VAL)
-#define DHD_HDRS_ON()          (brcmf_msg_level & DHD_HDRS_VAL)
-#define DHD_BYTES_ON()         (brcmf_msg_level & DHD_BYTES_VAL)
-#define DHD_INTR_ON()          (brcmf_msg_level & DHD_INTR_VAL)
-#define DHD_GLOM_ON()          (brcmf_msg_level & DHD_GLOM_VAL)
-#define DHD_EVENT_ON()         (brcmf_msg_level & DHD_EVENT_VAL)
-#define DHD_BTA_ON()           (brcmf_msg_level & DHD_BTA_VAL)
-#define DHD_ISCAN_ON()         (brcmf_msg_level & DHD_ISCAN_VAL)
+#define DHD_DATA_ON()          (brcmf_msg_level & BRCMF_DATA_VAL)
+#define DHD_CTL_ON()           (brcmf_msg_level & BRCMF_CTL_VAL)
+#define DHD_HDRS_ON()          (brcmf_msg_level & BRCMF_HDRS_VAL)
+#define DHD_BYTES_ON()         (brcmf_msg_level & BRCMF_BYTES_VAL)
+#define DHD_GLOM_ON()          (brcmf_msg_level & BRCMF_GLOM_VAL)
 
-#else  /* (defined BCMDBG) || (defined DHD_DEBUG) */
+#else  /* (defined BCMDBG) || (defined BCMDBG) */
 
 #define DHD_ERROR(args)  do {if (net_ratelimit()) printk args; } while (0)
 #define DHD_TRACE(args)
@@ -74,27 +62,15 @@
 #define DHD_INTR(args)
 #define DHD_GLOM(args)
 #define DHD_EVENT(args)
-#define DHD_BTA(args)
-#define DHD_ISCAN(args)
 
-#define DHD_ERROR_ON()         0
-#define DHD_TRACE_ON()         0
-#define DHD_INFO_ON()          0
 #define DHD_DATA_ON()          0
 #define DHD_CTL_ON()           0
-#define DHD_TIMER_ON()         0
 #define DHD_HDRS_ON()          0
 #define DHD_BYTES_ON()         0
-#define DHD_INTR_ON()          0
 #define DHD_GLOM_ON()          0
-#define DHD_EVENT_ON()         0
-#define DHD_BTA_ON()           0
-#define DHD_ISCAN_ON()         0
-#endif                         /* defined(DHD_DEBUG) */
 
-#define DHD_LOG(args)
+#endif                         /* defined(BCMDBG) */
 
-#define DHD_NONE(args)
 extern int brcmf_msg_level;
 
 #endif                         /* _dhd_dbg_ */