From patchwork Wed Apr 5 10:32:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96825 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196310qgd; Wed, 5 Apr 2017 03:34:17 -0700 (PDT) X-Received: by 10.98.215.23 with SMTP id b23mr28455398pfh.87.1491388457855; Wed, 05 Apr 2017 03:34:17 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l9si20203815pfi.300.2017.04.05.03.34.17; Wed, 05 Apr 2017 03:34:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933523AbdDEKeH (ORCPT + 6 others); Wed, 5 Apr 2017 06:34:07 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:35484 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933465AbdDEKd0 (ORCPT ); Wed, 5 Apr 2017 06:33:26 -0400 Received: by mail-pf0-f170.google.com with SMTP id i5so5592852pfc.2 for ; Wed, 05 Apr 2017 03:33:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SNCIiq1yLeT7V6fpfpRTFk3xHM5FIQKHIUTT63v0N58=; b=evsOXqQDYMs44cZveuGWd3Uz4Cw3C0wKh0pMs561CIelg+9520grwITF+KaFaLbAqD 75VU5pwbaR12R4ls+6PhgW6BgDSaR8B/loD1YX2FZIH/S5CIAS7jpFEqB1Uo8qm3VYhX CbrB36npRyCBIJEJOqVMAjYK3yr8QepvrLpD0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SNCIiq1yLeT7V6fpfpRTFk3xHM5FIQKHIUTT63v0N58=; b=a6CoMsvZ+NZ+iz4fHnL1lrzu+N2BAv4M1IaOoX46jdDpU05EFSZNHLDf2HTlqRhXRn BI5pgDnPt6JLCmE9ExZXhon+fkiUfwTXFtd/tVFOCojJb7Jjr5YHKNhWo97rSZn/CVXl LVoLPAVHKUDVbOaRNDHBryScpK+nqZOAEN0QATQclvM8pkboWzIm5mUhco1I+OOdlE2h +7+Iccs2EneUCCu4CJ0iiV7hdmWCyzsusV/+1zrQb2ZF+cMCLBlHlkndKoR5k6mp72FP pHDY2QX8KEoxzC/RxzYn9kH6s+YiPqfeeuath0aoQDB7YYUehXhJZKydhwtUm1sJ7aRS p3Sg== X-Gm-Message-State: AFeK/H2OsggWzeuqQGnRAfaWjgKXMwA9EwtjdYdtuo+TY7+pB8Jo3SqfVBzbq1uBO05zb1nE X-Received: by 10.84.196.164 with SMTP id l33mr35376684pld.0.1491388405431; Wed, 05 Apr 2017 03:33:25 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:24 -0700 (PDT) From: Amit Pundir To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Kalle Valo Subject: [PATCH v2 for-4.9 27/32] brcmfmac: merge two remaining brcmf_err macros Date: Wed, 5 Apr 2017 16:02:19 +0530 Message-Id: <1491388344-13521-28-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> References: <1491388344-13521-1-git-send-email-amit.pundir@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Rafał Miłecki Now we always have __brcmf_err function we can do perfectly fine with just one macro. Signed-off-by: Rafał Miłecki Acked-by: Arend van Spriel Signed-off-by: Kalle Valo (cherry picked from commit d0630555650a394cf5743268820511f527a561a5) Signed-off-by: Amit Pundir --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h index 441a666..0661261 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h @@ -47,20 +47,16 @@ __printf(2, 3) void __brcmf_err(const char *func, const char *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. +/* Macro for error messages. When debugging / tracing the driver all error + * messages are important to us. */ #define brcmf_err(fmt, ...) \ do { \ - if (IS_ENABLED(CONFIG_BRCMDBG) || net_ratelimit()) \ + if (IS_ENABLED(CONFIG_BRCMDBG) || \ + IS_ENABLED(CONFIG_BRCM_TRACING) || \ + net_ratelimit()) \ __brcmf_err(__func__, fmt, ##__VA_ARGS__); \ } while (0) -#else -#define brcmf_err(fmt, ...) \ - __brcmf_err(__func__, fmt, ##__VA_ARGS__) -#endif #if defined(DEBUG) || defined(CONFIG_BRCM_TRACING) __printf(3, 4)