Return-path: Received: from mail-pf0-f174.google.com ([209.85.192.174]:35121 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751767AbdATKNW (ORCPT ); Fri, 20 Jan 2017 05:13:22 -0500 Received: by mail-pf0-f174.google.com with SMTP id f144so21605564pfa.2 for ; Fri, 20 Jan 2017 02:13:22 -0800 (PST) Subject: Re: [PATCH RFC 1/2] brcmfmac: merge two brcmf_err macros into one To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Kalle Valo References: <20170118142703.9824-1-zajec5@gmail.com> Cc: Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= From: Arend Van Spriel Message-ID: (sfid-20170120_111327_703352_206A1E74) Date: Fri, 20 Jan 2017 11:13:10 +0100 MIME-Version: 1.0 In-Reply-To: <20170118142703.9824-1-zajec5@gmail.com> Content-Type: text/plain; charset=utf-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On 18-1-2017 15:27, Rafał Miłecki wrote: > From: Rafał Miłecki > > This allows simplifying the code by adding a simple IS_ENABLED check for > CONFIG_BRCMDB symbol. Nice! Acked-by: Arend van Spriel > Signed-off-by: Rafał Miłecki > --- > 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, ...); >