| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- From d0630555650a394cf5743268820511f527a561a5 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:15 +0100
- Subject: [PATCH] brcmfmac: merge two remaining brcmf_err macros
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Now we always have __brcmf_err function we can do perfectly fine with
- just one macro.
- 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 | 14 +++++---------
- 1 file changed, 5 insertions(+), 9 deletions(-)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
- @@ -47,20 +47,16 @@
-
- __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
- - * messages are as important as other tracing or even more so.
- +/* Macro for error messages. When debugging / tracing the driver all error
- + * messages are important to us.
- */
- #define brcmf_err(fmt, ...) \
- do { \
- - if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit()) \
- + if (IS_ENABLED(CPTCFG_BRCMDBG) || \
- + IS_ENABLED(CPTCFG_BRCM_TRACING) || \
- + net_ratelimit()) \
- __brcmf_err(__func__, fmt, ##__VA_ARGS__); \
- } while (0)
- -#else
- -#define brcmf_err(fmt, ...) \
- - __brcmf_err(__func__, fmt, ##__VA_ARGS__)
- -#endif
-
- #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)
- __printf(3, 4)
|
