On 20-1-2017 11:13, Arend Van Spriel wrote:
> On 18-1-2017 15:27, Rafał Miłecki wrote:
>> From: Rafał Miłecki <rafal@xxxxxxxxxx>
>>
>> This allows simplifying the code by adding a simple IS_ENABLED check for
>> CONFIG_BRCMDB symbol.
Actually it should be CONFIG_BRCMDBG above.
Kalle,
Can you fix that in the commit message?
Regards,
Arend
> Nice!
>
> Acked-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx>
>> Signed-off-by: Rafał Miłecki <rafal@xxxxxxxxxx>
>> ---
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------
>> 1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
>> index 6687812..1fe4aa9 100644
>> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
>> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
>> @@ -45,20 +45,16 @@
>> #undef pr_fmt
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>>
>> +#ifndef CONFIG_BRCM_TRACING
>> /* 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.
>> */
>> -#ifndef CONFIG_BRCM_TRACING
>> -#ifdef CONFIG_BRCMDBG
>> -#define brcmf_err(fmt, ...) pr_err("%s: " fmt, __func__, ##__VA_ARGS__)
>> -#else
>> #define brcmf_err(fmt, ...) \
>> do { \
>> - if (net_ratelimit()) \
>> + if (IS_ENABLED(CONFIG_BRCMDBG) || net_ratelimit()) \
>> pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \
>> } while (0)
>> -#endif
>> #else
>> __printf(2, 3)
>> void __brcmf_err(const char *func, const char *fmt, ...);
>>
