package/kernel/mac80211/patches/319-0004-brcmfmac-merge-two-brcmf_err-macros-into-one.patch

   1 From 9587a01a7ead9efc5032c16e0d9668de58be1186 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:13 +0100
   4 Subject: [PATCH] brcmfmac: merge two brcmf_err macros into one
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 This allows simplifying the code by adding a simple IS_ENABLED check for
  10 CONFIG_BRCMDB symbol.
  11
  12 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  13 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  14 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  15 ---
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------
  17  1 file changed, 2 insertions(+), 6 deletions(-)
  18
  19 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  20 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  21 @@ -45,20 +45,16 @@
  22  #undef pr_fmt
  23  #define pr_fmt(fmt)            KBUILD_MODNAME ": " fmt
  24
  25 +#ifndef CPTCFG_BRCM_TRACING
  26  /* Macro for error messages. net_ratelimit() is used when driver
  27   * debugging is not selected. When debugging the driver error
  28   * messages are as important as other tracing or even more so.
  29   */
  30 -#ifndef CPTCFG_BRCM_TRACING
  31 -#ifdef CPTCFG_BRCMDBG
  32 -#define brcmf_err(fmt, ...)    pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
  33 -#else
  34  #define brcmf_err(fmt, ...)                                            \
  35         do {                                                            \
  36 -               if (net_ratelimit())                                    \
  37 +               if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit())      \
  38                         pr_err("%s: " fmt, __func__, ##__VA_ARGS__);    \
  39         } while (0)
  40 -#endif
  41  #else
  42  __printf(2, 3)
  43  void __brcmf_err(const char *func, const char *fmt, ...);