1 From 087fa712a00685dac4bcc64b7c3dc8ae6bee8026 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Thu, 2 Feb 2017 22:33:14 +0100
4 Subject: [PATCH] brcmfmac: switch to C function (__brcmf_err) for printing
7 Content-Type: text/plain; charset=UTF-8
8 Content-Transfer-Encoding: 8bit
10 This will allow extending code and using more detailed messages e.g.
11 with the help of dev_err.
13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
14 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
17 .../net/wireless/broadcom/brcm80211/brcmfmac/common.c | 16 ++++++++++++++++
18 drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 6 +++---
19 2 files changed, 19 insertions(+), 3 deletions(-)
21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
23 @@ -218,6 +218,22 @@ done:
27 +#ifndef CPTCFG_BRCM_TRACING
28 +void __brcmf_err(const char *func, const char *fmt, ...)
30 + struct va_format vaf;
33 + va_start(args, fmt);
37 + pr_err("%s: %pV", func, &vaf);
43 #if defined(CPTCFG_BRCM_TRACING) || defined(CPTCFG_BRCMDBG)
44 void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
46 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
47 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
50 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
53 +void __brcmf_err(const char *func, const char *fmt, ...);
54 #ifndef CPTCFG_BRCM_TRACING
55 /* Macro for error messages. net_ratelimit() is used when driver
56 * debugging is not selected. When debugging the driver error
58 #define brcmf_err(fmt, ...) \
60 if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
61 - pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
62 + __brcmf_err(__func__, fmt, ##__VA_ARGS__); \
66 -void __brcmf_err(const char *func, const char *fmt, ...);
67 #define brcmf_err(fmt, ...) \
68 __brcmf_err(__func__, fmt, ##__VA_ARGS__)