2 files changed, 34 insertions, 21 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index bd2f1fae72a9..4ba6560f0bf3 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -57,6 +57,36 @@ int ath6kl_printk(const char *level, const char *fmt, ...)
 
 #ifdef CONFIG_ATH6KL_DEBUG
 
+void ath6kl_dbg(enum ATH6K_DEBUG_MASK mask, const char *fmt, ...)
+{
+        struct va_format vaf;
+        va_list args;
+
+        if (!(debug_mask & mask))
+                return;
+
+        va_start(args, fmt);
+
+        vaf.fmt = fmt;
+        vaf.va = &args;
+
+        ath6kl_printk(KERN_DEBUG, "%pV", &vaf);
+
+        va_end(args);
+}
+
+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);
+        }
+}
+
 #define REG_OUTPUT_LEN_PER_LINE 25
 #define REGTYPE_STR_LEN         100
 
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 9dc39754a35f..872a8ce5d8f3 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -60,28 +60,11 @@ enum ath6kl_war {
 };
 
 #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,