From 93cf47a00bbc6107e343fb305b2a5279b3558290 Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 29 Jun 2011 16:48:07 -0700 Subject: [PATCH] --- yaml --- r: 259826 b: refs/heads/master c: 257ca7c93566d367d924099590a35586a8608a67 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/brcm80211/brcmfmac/dhd_dbg.h | 26 +------------------ 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/[refs] b/[refs] index 1005cf0bbdf3..580087b6b623 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b68818585d58c07ab8eb21355a8f0df027c22be +refs/heads/master: 257ca7c93566d367d924099590a35586a8608a67 diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h index 678a7e25379d..4733de79336a 100644 --- a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h +++ b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_dbg.h @@ -42,24 +42,12 @@ printk args; } while (0) #define DHD_EVENT(args) do {if (brcmf_msg_level & BRCMF_EVENT_VAL) \ printk args; } while (0) -#define DHD_BTA(args) do {if (brcmf_msg_level & BRCMF_BTA_VAL) \ - printk args; } while (0) -#define DHD_ISCAN(args) do {if (brcmf_msg_level & BRCMF_ISCAN_VAL) \ - printk args; } while (0) -#define DHD_ERROR_ON() (brcmf_msg_level & BRCMF_ERROR_VAL) -#define DHD_TRACE_ON() (brcmf_msg_level & BRCMF_TRACE_VAL) -#define DHD_INFO_ON() (brcmf_msg_level & BRCMF_INFO_VAL) #define DHD_DATA_ON() (brcmf_msg_level & BRCMF_DATA_VAL) #define DHD_CTL_ON() (brcmf_msg_level & BRCMF_CTL_VAL) -#define DHD_TIMER_ON() (brcmf_msg_level & BRCMF_TIMER_VAL) #define DHD_HDRS_ON() (brcmf_msg_level & BRCMF_HDRS_VAL) #define DHD_BYTES_ON() (brcmf_msg_level & BRCMF_BYTES_VAL) -#define DHD_INTR_ON() (brcmf_msg_level & BRCMF_INTR_VAL) #define DHD_GLOM_ON() (brcmf_msg_level & BRCMF_GLOM_VAL) -#define DHD_EVENT_ON() (brcmf_msg_level & BRCMF_EVENT_VAL) -#define DHD_BTA_ON() (brcmf_msg_level & BRCMF_BTA_VAL) -#define DHD_ISCAN_ON() (brcmf_msg_level & BRCMF_ISCAN_VAL) #else /* (defined BCMDBG) || (defined BCMDBG) */ @@ -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(BCMDBG) */ -#define DHD_LOG(args) +#endif /* defined(BCMDBG) */ -#define DHD_NONE(args) extern int brcmf_msg_level; #endif /* _dhd_dbg_ */