1 files changed, 5 insertions, 23 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 9853c9c125c1..c4be6e50996b 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -41,6 +41,7 @@ enum ATH6K_DEBUG_MASK {
         ATH6KL_DBG_BOOT         = BIT(18),    /* driver init and fw boot */
         ATH6KL_DBG_WMI_DUMP     = BIT(19),
         ATH6KL_DBG_SUSPEND      = BIT(20),
+        ATH6KL_DBG_USB          = BIT(21),
         ATH6KL_DBG_ANY          = 0xffffffff  /* enable all logs */
 };
 
@@ -55,35 +56,16 @@ int ath6kl_printk(const char *level, const char *fmt, ...);
 #define ath6kl_warn(fmt, ...)                                   \
         ath6kl_printk(KERN_WARNING, fmt, ##__VA_ARGS__)
 
-#define AR_DBG_LVL_CHECK(mask)  (debug_mask & mask)
-
 enum ath6kl_war {
         ATH6KL_WAR_INVALID_RATE,
 };
 
 #ifdef CONFIG_ATH6KL_DEBUG
-#define ath6kl_dbg(mask, fmt, ...)                                      \
-        ({                                                              \
-         int rtn;                                                       \
-         if (debug_mask & mask)                                         \
-                rtn = ath6kl_printk(KERN_DEBUG, fmt, ##__VA_ARGS__);    \
-         else                                                           \
-                rtn = 0;                                                \
-                                                                        \
-         rtn;                                                           \
-         })
 
-static inline void ath6kl_dbg_dump(enum ATH6K_DEBUG_MASK mask,
-                                   const char *msg, const char *prefix,
-                                   const void *buf, size_t len)
-{
-        if (debug_mask & mask) {
-                if (msg)
-                        ath6kl_dbg(mask, "%s\n", msg);
-
-                print_hex_dump_bytes(prefix, DUMP_PREFIX_OFFSET, buf, len);
-        }
-}
+void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...);
+void ath6kl_dbg_dump(enum ATH6K_DEBUG_MASK mask,
+                     const char *msg, const char *prefix,
+                     const void *buf, size_t len);
 
 void ath6kl_dump_registers(struct ath6kl_device *dev,
                            struct ath6kl_irq_proc_registers *irq_proc_reg,