Hi,

On 08-03-17 17:34, Joe Perches wrote:
On Wed, 2017-03-08 at 09:23 +0100, Hans de Goede wrote:
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 <hdego...@redhat.com>
---
Changes in v2:
-Fix brcm_err typo (should be brcmf_err) in CONFIG_BRCM_TRACING case
Changes in v3:
-Use do { } while (0) around macro

why?  Single statement macros do not need a do/while

Because Arend ask me to during review of v2.


diff --git 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 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_info(fmt, ...)
        pr_info("%s: " fmt, __func__, ##__VA_ARGS__)

+
 #define brcmf_dbg(level, fmt, ...) no_printk(fmt, ##__VA_ARGS__)

I think the separate defines for DEBUG/CONFIG_BRCM_TRACING
are not necessary.

When tracing we want the message logging the firmware version
to show up in the trace, which requires calling __brcmf_err()

Regards,

Hans

Reply via email to