瀏覽代碼

brcmfmac: merge two brcmf_err macros into one

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>
Rafał Miłecki 8 年之前
父節點
當前提交
9587a01a7e
共有 1 個文件被更改,包括 2 次插入6 次删除
  1. 2 6
      drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h

+ 2 - 6
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h

@@ -45,20 +45,16 @@
 #undef pr_fmt
 #undef pr_fmt
 #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
 #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
 
 
+#ifndef CONFIG_BRCM_TRACING
 /* Macro for error messages. net_ratelimit() is used when driver
 /* Macro for error messages. net_ratelimit() is used when driver
  * debugging is not selected. When debugging the driver error
  * debugging is not selected. When debugging the driver error
  * messages are as important as other tracing or even more so.
  * messages are as important as other tracing or even more so.
  */
  */
-#ifndef CONFIG_BRCM_TRACING
-#ifdef CONFIG_BRCMDBG
-#define brcmf_err(fmt, ...)	pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
-#else
 #define brcmf_err(fmt, ...)						\
 #define brcmf_err(fmt, ...)						\
 	do {								\
 	do {								\
-		if (net_ratelimit())					\
+		if (IS_ENABLED(CONFIG_BRCMDBG) || net_ratelimit())	\
 			pr_err("%s: " fmt, __func__, ##__VA_ARGS__);	\
 			pr_err("%s: " fmt, __func__, ##__VA_ARGS__);	\
 	} while (0)
 	} while (0)
-#endif
 #else
 #else
 __printf(2, 3)
 __printf(2, 3)
 void __brcmf_err(const char *func, const char *fmt, ...);
 void __brcmf_err(const char *func, const char *fmt, ...);