On Wed, 2013-01-02 at 15:22 +0100, Arend van Spriel wrote:
> Several source files (but not all) define the pr_fmt() macro in exactly
> the same way. Instead this commit defines it in a header file so driver
> logging is consistent.
The commit message doesn't describe the change to brcm_err
> diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h
[]
> @@ -34,19 +34,12 @@
> #define BRCMF_SCAN_VAL 0x4000
> #define BRCMF_CONN_VAL 0x8000
>
> -/* Macro for error messages. net_ratelimit() is used when driver
> - * debugging is not selected. When debugging the driver error
> - * messages are as important as other tracing or even more so.
> - */
> -#ifdef CONFIG_BRCMDBG
> +/* set default print format */
> +#undef pr_fmt
> +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
> +
> +/* error messages are always logged */
> #define brcmf_err(fmt, ...) pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
> -#else
> -#define brcmf_err(fmt, ...) \
> - do { \
> - if (net_ratelimit()) \
> - pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
> - } while (0)
> -#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
