[PATCH 5/7] ath6kl: convert ath6kl_info/err/warn macros to real functions
From: Kalle Valo <hidden>
Date: 2012-12-27 11:52:57
Subsystem:
atheros ath generic utilities, atheros ath6kl wireless driver, the rest · Maintainers:
Jeff Johnson, Linus Torvalds
After this it's cleaner to add trace calls. And besides, I prefer C over CPP. Signed-off-by: Kalle Valo <redacted> --- drivers/net/wireless/ath/ath6kl/debug.h | 53 +++++++++++++++++++++++++++---- 1 files changed, 47 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index f97cd4e..06f47f5 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h@@ -52,12 +52,53 @@ extern unsigned int debug_mask; extern __printf(2, 3) int ath6kl_printk(const char *level, const char *fmt, ...); -#define ath6kl_info(fmt, ...) \ - ath6kl_printk(KERN_INFO, fmt, ##__VA_ARGS__) -#define ath6kl_err(fmt, ...) \ - ath6kl_printk(KERN_ERR, fmt, ##__VA_ARGS__) -#define ath6kl_warn(fmt, ...) \ - ath6kl_printk(KERN_WARNING, fmt, ##__VA_ARGS__) +static inline __printf(1,2) int ath6kl_info(const char *fmt, ...) +{ + struct va_format vaf = { + .fmt = fmt, + }; + va_list args; + int ret; + + va_start(args, fmt); + vaf.va = &args; + ret = ath6kl_printk(KERN_INFO, "%pV", &vaf); + va_end(args); + + return ret; +} + +static inline __printf(1,2) int ath6kl_err(const char *fmt, ...) +{ + struct va_format vaf = { + .fmt = fmt, + }; + va_list args; + int ret; + + va_start(args, fmt); + vaf.va = &args; + ret = ath6kl_printk(KERN_ERR, "%pV", &vaf); + va_end(args); + + return ret; +} + +static inline __printf(1,2) int ath6kl_warn(const char *fmt, ...) +{ + struct va_format vaf = { + .fmt = fmt, + }; + va_list args; + int ret; + + va_start(args, fmt); + vaf.va = &args; + ret = ath6kl_printk(KERN_WARNING, "%pV", &vaf); + va_end(args); + + return ret; +} enum ath6kl_war { ATH6KL_WAR_INVALID_RATE,