package/kernel/mac80211/patches/319-0005-brcmfmac-switch-to-C-function-__brcmf_err-for-printi.patch

   1 From 087fa712a00685dac4bcc64b7c3dc8ae6bee8026 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:14 +0100
   4 Subject: [PATCH] brcmfmac: switch to C function (__brcmf_err) for printing
   5  errors
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This will allow extending code and using more detailed messages e.g.
  11 with the help of dev_err.
  12
  13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  14 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17  .../net/wireless/broadcom/brcm80211/brcmfmac/common.c    | 16 ++++++++++++++++
  18  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h |  6 +++---
  19  2 files changed, 19 insertions(+), 3 deletions(-)
  20
  21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  23 @@ -218,6 +218,22 @@ done:
  24         return err;
  25  }
  26
  27 +#ifndef CPTCFG_BRCM_TRACING
  28 +void __brcmf_err(const char *func, const char *fmt, ...)
  29 +{
  30 +       struct va_format vaf;
  31 +       va_list args;
  32 +
  33 +       va_start(args, fmt);
  34 +
  35 +       vaf.fmt = fmt;
  36 +       vaf.va = &args;
  37 +       pr_err("%s: %pV", func, &vaf);
  38 +
  39 +       va_end(args);
  40 +}
  41 +#endif
  42 +
  43  #if defined(CPTCFG_BRCM_TRACING) || defined(CPTCFG_BRCMDBG)
  44  void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
  45  {
  46 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  47 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  48 @@ -45,6 +45,8 @@
  49  #undef pr_fmt
  50  #define pr_fmt(fmt)            KBUILD_MODNAME ": " fmt
  51
  52 +__printf(2, 3)
  53 +void __brcmf_err(const char *func, const char *fmt, ...);
  54  #ifndef CPTCFG_BRCM_TRACING
  55  /* Macro for error messages. net_ratelimit() is used when driver
  56   * debugging is not selected. When debugging the driver error
  57 @@ -53,11 +55,9 @@
  58  #define brcmf_err(fmt, ...)                                            \
  59         do {                                                            \
  60                 if (IS_ENABLED(CPTCFG_BRCMDBG) || net_ratelimit())      \
  61 -                       pr_err("%s: " fmt, __func__, ##__VA_ARGS__);    \
  62 +                       __brcmf_err(__func__, fmt, ##__VA_ARGS__);      \
  63         } while (0)
  64  #else
  65 -__printf(2, 3)
  66 -void __brcmf_err(const char *func, const char *fmt, ...);
  67  #define brcmf_err(fmt, ...) \
  68         __brcmf_err(__func__, fmt, ##__VA_ARGS__)
  69  #endif