43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 9587a01a7ead9efc5032c16e0d9668de58be1186 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:13 +0100
|
|
Subject: [PATCH] brcmfmac: merge two brcmf_err macros into one
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This allows simplifying the code by adding a simple IS_ENABLED check for
|
|
CONFIG_BRCMDB symbol.
|
|
|
|
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>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
|
|
@@ -45,20 +45,16 @@
|
|
#undef pr_fmt
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
+#ifndef CPTCFG_BRCM_TRACING
|
|
/* Macro for error messages. net_ratelimit() is used when driver
|
|
* debugging is not selected. When debugging the driver error
|
|
* messages are as important as other tracing or even more so.
|
|
*/
|
|
-#ifndef CPTCFG_BRCM_TRACING
|
|
-#ifdef CPTCFG_BRCMDBG
|
|
-#define brcmf_err(fmt, ...) pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
|
|
-#else
|
|
#define brcmf_err(fmt, ...) \
|
|
do { \
|
|
- if (net_ratelimit()) \
|
|
+ if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
|
|
pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
|
|
} while (0)
|
|
-#endif
|
|
#else
|
|
__printf(2, 3)
|
|
void __brcmf_err(const char *func, const char *fmt, ...);
|