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