package/kernel/mac80211/patches/323-0003-brcmfmac-Do-not-print-the-firmware-version-as-an-err.patch

   1 From d79fe4cb70d8deab7b8dc1de547ed4b915574414 Mon Sep 17 00:00:00 2001
   2 From: Hans de Goede <hdegoede@redhat.com>
   3 Date: Wed, 8 Mar 2017 14:50:15 +0100
   4 Subject: [PATCH] brcmfmac: Do not print the firmware version as an error
   5
   6 Using pr_err for things which are not errors is a bad idea. E.g. it
   7 will cause the plymouth bootsplash screen to drop back to the text
   8 console so that the user can see the error, which is not what we
   9 normally want to happen.
  10
  11 Instead add a new brcmf_info macro and use that.
  12
  13 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  14 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-
  18  drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h  | 9 +++++++++
  19  2 files changed, 10 insertions(+), 1 deletion(-)
  20
  21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  23 @@ -161,7 +161,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
  24         strsep(&ptr, "\n");
  25
  26         /* Print fw version info */
  27 -       brcmf_err("Firmware version = %s\n", buf);
  28 +       brcmf_info("Firmware version = %s\n", buf);
  29
  30         /* locate firmware version number for ethtool */
  31         ptr = strrchr(buf, ' ') + 1;
  32 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  33 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
  34 @@ -59,6 +59,10 @@ void __brcmf_err(const char *func, const
  35         } while (0)
  36
  37  #if defined(DEBUG) || defined(CPTCFG_BRCM_TRACING)
  38 +
  39 +/* For debug/tracing purposes treat info messages as errors */
  40 +#define brcmf_info brcmf_err
  41 +
  42  __printf(3, 4)
  43  void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...);
  44  #define brcmf_dbg(level, fmt, ...)                             \
  45 @@ -77,6 +81,11 @@ do {                                                         \
  46
  47  #else /* defined(DEBUG) || defined(CPTCFG_BRCM_TRACING) */
  48
  49 +#define brcmf_info(fmt, ...)                                           \
  50 +       do {                                                            \
  51 +               pr_info("%s: " fmt, __func__, ##__VA_ARGS__);           \
  52 +       } while (0)
  53 +
  54  #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)
  55
  56  #define BRCMF_DATA_ON()                0