70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
|
From 087fa712a00685dac4bcc64b7c3dc8ae6bee8026 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||
|
|
Date: Thu, 2 Feb 2017 22:33:14 +0100
|
||
|
|
Subject: [PATCH] brcmfmac: switch to C function (__brcmf_err) for printing
|
||
|
|
errors
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This will allow extending code and using more detailed messages e.g.
|
||
|
|
with the help of dev_err.
|
||
|
|
|
||
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||
|
|
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
||
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
||
|
|
---
|
||
|
|
.../net/wireless/broadcom/brcm80211/brcmfmac/common.c | 16 ++++++++++++++++
|
||
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 6 +++---
|
||
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
|
||
|
|
@@ -218,6 +218,22 @@ done:
|
||
|
|
return err;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifndef CPTCFG_BRCM_TRACING
|
||
|
|
+void __brcmf_err(const char *func, const char *fmt, ...)
|
||
|
|
+{
|
||
|
|
+ struct va_format vaf;
|
||
|
|
+ va_list args;
|
||
|
|
+
|
||
|
|
+ va_start(args, fmt);
|
||
|
|
+
|
||
|
|
+ vaf.fmt = fmt;
|
||
|
|
+ vaf.va = &args;
|
||
|
|
+ pr_err("%s: %pV", func, &vaf);
|
||
|
|
+
|
||
|
|
+ va_end(args);
|
||
|
|
+}
|
||
|
|
+#endif
|
||
|
|
+
|
||
|
|
#if defined(CPTCFG_BRCM_TRACING) || defined(CPTCFG_BRCMDBG)
|
||
|
|
void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
|
||
|
|
{
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
|
||
|
|
@@ -45,6 +45,8 @@
|
||
|
|
#undef pr_fmt
|
||
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||
|
|
|
||
|
|
+__printf(2, 3)
|
||
|
|
+void __brcmf_err(const char *func, const char *fmt, ...);
|
||
|
|
#ifndef CPTCFG_BRCM_TRACING
|
||
|
|
/* Macro for error messages. net_ratelimit() is used when driver
|
||
|
|
* debugging is not selected. When debugging the driver error
|
||
|
|
@@ -53,11 +55,9 @@
|
||
|
|
#define brcmf_err(fmt, ...) \
|
||
|
|
do { \
|
||
|
|
if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
|
||
|
|
- pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
|
||
|
|
+ __brcmf_err(__func__, fmt, ##__VA_ARGS__); \
|
||
|
|
} while (0)
|
||
|
|
#else
|
||
|
|
-__printf(2, 3)
|
||
|
|
-void __brcmf_err(const char *func, const char *fmt, ...);
|
||
|
|
#define brcmf_err(fmt, ...) \
|
||
|
|
__brcmf_err(__func__, fmt, ##__VA_ARGS__)
|
||
|
|
#endif
|