Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d79fe4cb authored by Hans de Goede's avatar Hans de Goede Committed by Kalle Valo
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent f1ac3aa2

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) 
	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;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h

+9 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ void __brcmf_err(const char *func, const char *fmt, ...); 
	} while (0)



#if defined(DEBUG) || defined(CONFIG_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(CONFIG_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