From: Joe Perches Date: Wed, 19 Mar 2014 00:59:47 +0000 (-0700) Subject: rsi: Add pr_fmt,__printf, fix format & arg mismatch X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5fe1b76a9fac5224ff31fc3bce62ba273b65ced1;p=openwrt%2Fstaging%2Fblogic.git rsi: Add pr_fmt,__printf, fix format & arg mismatch Emit a prefix for the rsi_dbg messages. Fix the format and argument mismatch and add __printf(2, 3) to try to avoid more. Signed-off-by: Joe Perches Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rsi/rsi_91x_main.c b/drivers/net/wireless/rsi/rsi_91x_main.c index 7367be4a58ad..8810862ae826 100644 --- a/drivers/net/wireless/rsi/rsi_91x_main.c +++ b/drivers/net/wireless/rsi/rsi_91x_main.c @@ -14,6 +14,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include #include #include "rsi_mgmt.h" diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index f09c72ef55d5..ef37d4b27bd4 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -393,7 +393,8 @@ static int rsi_mgmt_pkt_to_core(struct rsi_common *common, msg_len -= pad_bytes; if ((msg_len <= 0) || (!msg)) { - rsi_dbg(MGMT_RX_ZONE, "Invalid rx msg of len = %d\n", + rsi_dbg(MGMT_RX_ZONE, + "%s: Invalid rx msg of len = %d\n", __func__, msg_len); return -EINVAL; } diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h index e97e6ad07562..2cb73e7edb98 100644 --- a/drivers/net/wireless/rsi/rsi_main.h +++ b/drivers/net/wireless/rsi/rsi_main.h @@ -40,7 +40,7 @@ #define FSM_MAC_INIT_DONE 6 extern u32 rsi_zone_enabled; -extern void rsi_dbg(u32 zone, const char *fmt, ...); +extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...); #define RSI_MAX_VIFS 1 #define NUM_EDCA_QUEUES 4