1 files changed, 8 insertions, 66 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
index c163e4dea972..0e7052039402 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -17,72 +17,14 @@
 #ifndef _wl_cfg80211_h_
 #define _wl_cfg80211_h_
-#define WL_DBG_NONE             0
+#include "dhd_dbg.h"
-#define WL_DBG_CONN             (1 << 5)
-#define WL_DBG_SCAN             (1 << 4)
+#define WL_ERR(fmt, ...)        brcmf_err(fmt, ##__VA_ARGS__)
-#define WL_DBG_TRACE            (1 << 3)
-#define WL_DBG_INFO             (1 << 1)
+#define WL_INFO(fmt, ...)       brcmf_dbg(INFO, fmt, ##__VA_ARGS__)
-#define WL_DBG_ERR              (1 << 0)
+#define WL_TRACE(fmt, ...)      brcmf_dbg(TRACE, fmt, ##__VA_ARGS__)
-#define WL_DBG_MASK             ((WL_DBG_INFO | WL_DBG_ERR | WL_DBG_TRACE) | \
+#define WL_SCAN(fmt, ...)       brcmf_dbg(SCAN, fmt, ##__VA_ARGS__)
-                                (WL_DBG_SCAN) | (WL_DBG_CONN))
+#define WL_CONN(fmt, ...)       brcmf_dbg(CONN, fmt, ##__VA_ARGS__)
-#define WL_ERR(fmt, ...)                                        \
-do {                                                            \
-        if (brcmf_dbg_level & WL_DBG_ERR) {                     \
-                if (net_ratelimit()) {                          \
-                        pr_err("ERROR @%s : " fmt,              \
-                               __func__, ##__VA_ARGS__);        \
-                }                                               \
-        }                                                       \
-} while (0)
-#if (defined DEBUG)
-#define WL_INFO(fmt, ...)                                       \
-do {                                                            \
-        if (brcmf_dbg_level & WL_DBG_INFO) {                    \
-                if (net_ratelimit()) {                          \
-                        pr_err("INFO @%s : " fmt,               \
-                               __func__, ##__VA_ARGS__);        \
-                }                                               \
-        }                                                       \
-} while (0)
-#define WL_TRACE(fmt, ...)                                      \
-do {                                                            \
-        if (brcmf_dbg_level & WL_DBG_TRACE) {                   \
-                if (net_ratelimit()) {                          \
-                        pr_err("TRACE @%s : " fmt,              \
-                               __func__, ##__VA_ARGS__);        \
-                }                                               \
-        }                                                       \
-} while (0)
-#define WL_SCAN(fmt, ...)                                       \
-do {                                                            \
-        if (brcmf_dbg_level & WL_DBG_SCAN) {                    \
-                if (net_ratelimit()) {                          \
-                        pr_err("SCAN @%s : " fmt,               \
-                               __func__, ##__VA_ARGS__);        \
-                }                                               \
-        }                                                       \
-} while (0)
-#define WL_CONN(fmt, ...)                                       \
-do {                                                            \
-        if (brcmf_dbg_level & WL_DBG_CONN) {                    \
-                if (net_ratelimit()) {                          \
-                        pr_err("CONN @%s : " fmt,               \
-                               __func__, ##__VA_ARGS__);        \
-                }                                               \
-        }                                                       \
-} while (0)
-#else /* (defined DEBUG) */
-#define WL_INFO(fmt, args...)
-#define WL_TRACE(fmt, args...)
-#define WL_SCAN(fmt, args...)
-#define WL_CONN(fmt, args...)
-#endif /* (defined DEBUG) */
 #define WL_NUM_SCAN_MAX                 10
 #define WL_NUM_PMKIDS_MAX               MAXPMKID

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h index c163e4dea972..0e7052039402 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.h
@@ -17,72 +17,14 @@
17	#ifndef _wl_cfg80211_h_	17	#ifndef _wl_cfg80211_h_
18	#define _wl_cfg80211_h_	18	#define _wl_cfg80211_h_
19		19
20	#define WL_DBG_NONE 0	20	#include "dhd_dbg.h"
21	#define WL_DBG_CONN (1 << 5)	21
22	#define WL_DBG_SCAN (1 << 4)	22	#define WL_ERR(fmt, ...) brcmf_err(fmt, ##__VA_ARGS__)
23	#define WL_DBG_TRACE (1 << 3)	23
24	#define WL_DBG_INFO (1 << 1)	24	#define WL_INFO(fmt, ...) brcmf_dbg(INFO, fmt, ##__VA_ARGS__)
25	#define WL_DBG_ERR (1 << 0)	25	#define WL_TRACE(fmt, ...) brcmf_dbg(TRACE, fmt, ##__VA_ARGS__)
26	#define WL_DBG_MASK ((WL_DBG_INFO \| WL_DBG_ERR \| WL_DBG_TRACE) \| \	26	#define WL_SCAN(fmt, ...) brcmf_dbg(SCAN, fmt, ##__VA_ARGS__)
27	(WL_DBG_SCAN) \| (WL_DBG_CONN))	27	#define WL_CONN(fmt, ...) brcmf_dbg(CONN, fmt, ##__VA_ARGS__)
28
29	#define WL_ERR(fmt, ...) \
30	do { \
31	if (brcmf_dbg_level & WL_DBG_ERR) { \
32	if (net_ratelimit()) { \
33	pr_err("ERROR @%s : " fmt, \
34	__func__, ##__VA_ARGS__); \
35	} \
36	} \
37	} while (0)
38
39	#if (defined DEBUG)
40	#define WL_INFO(fmt, ...) \
41	do { \
42	if (brcmf_dbg_level & WL_DBG_INFO) { \
43	if (net_ratelimit()) { \
44	pr_err("INFO @%s : " fmt, \
45	__func__, ##__VA_ARGS__); \
46	} \
47	} \
48	} while (0)
49
50	#define WL_TRACE(fmt, ...) \
51	do { \
52	if (brcmf_dbg_level & WL_DBG_TRACE) { \
53	if (net_ratelimit()) { \
54	pr_err("TRACE @%s : " fmt, \
55	__func__, ##__VA_ARGS__); \
56	} \
57	} \
58	} while (0)
59
60	#define WL_SCAN(fmt, ...) \
61	do { \
62	if (brcmf_dbg_level & WL_DBG_SCAN) { \
63	if (net_ratelimit()) { \
64	pr_err("SCAN @%s : " fmt, \
65	__func__, ##__VA_ARGS__); \
66	} \
67	} \
68	} while (0)
69
70	#define WL_CONN(fmt, ...) \
71	do { \
72	if (brcmf_dbg_level & WL_DBG_CONN) { \
73	if (net_ratelimit()) { \
74	pr_err("CONN @%s : " fmt, \
75	__func__, ##__VA_ARGS__); \
76	} \
77	} \
78	} while (0)
79
80	#else /* (defined DEBUG) */
81	#define WL_INFO(fmt, args...)
82	#define WL_TRACE(fmt, args...)
83	#define WL_SCAN(fmt, args...)
84	#define WL_CONN(fmt, args...)
85	#endif /* (defined DEBUG) */
86		28
87	#define WL_NUM_SCAN_MAX 10	29	#define WL_NUM_SCAN_MAX 10
88	#define WL_NUM_PMKIDS_MAX MAXPMKID	30	#define WL_NUM_PMKIDS_MAX MAXPMKID