From patchwork Tue Apr 4 06:18:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96690 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp48323qgd; Mon, 3 Apr 2017 23:18:32 -0700 (PDT) X-Received: by 10.99.140.27 with SMTP id m27mr22350514pgd.174.1491286711944; Mon, 03 Apr 2017 23:18:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a9si746909pgf.57.2017.04.03.23.18.31; Mon, 03 Apr 2017 23:18:31 -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 S1752527AbdDDGSb (ORCPT + 6 others); Tue, 4 Apr 2017 02:18:31 -0400 Received: from mail-pg0-f48.google.com ([74.125.83.48]:33469 "EHLO mail-pg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752498AbdDDGSa (ORCPT ); Tue, 4 Apr 2017 02:18:30 -0400 Received: by mail-pg0-f48.google.com with SMTP id x125so142565157pgb.0 for ; Mon, 03 Apr 2017 23:18:30 -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=g6vIxowBTC9cV+ApmvHddQxIRgz8o+Mfx05gLtIKzzniosokNZahbynY0JIdMSXLYW S6NW27mQi0Uw420Aw4sHEGGqGTJuGyXfbBGygHbd3ZTsU5guqIldPPNvNcGoXYrPu55L 86Ld5Jg0POAbuKajN7YHwctXGw0574hnQh8Ps= 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=anyIWnAZvEXLLEmii5HYD4S8JpXAR9+n7fuktcn7bRfudRlm99CRb9lkUFMXIM65dT JSmGeKn78GH1UpZAPeJutTh9afNgMKPSZCBqknO2O/ojdZUeusCUiUGRnexbGiy0OUlT fMv3dBoqq2SGMdCvw7AxY8LVL0FCHvJHiAnv0o5yn26P6s8nHMmAI5BI04tSDRBEUEyq CmmdH+nHMHkPRNRyWsxAs0/kgmMsaH4WEi516ChZGPaIxTAARiIK6TTV86StMWDXuIQt ouQlHMls1YcvCkUYym1idcLCsdLNOmONbWCjT6mufPmK0V1irXOW2i6uo3iZCfZ1HtZS 6OPA== X-Gm-Message-State: AFeK/H2s/GdSFOKr7TKx0Zrb66llqDGhwzS3o+KPxJEw4tXg6tJMHBs6//HJLWLtrt9BNKA1 X-Received: by 10.84.248.79 with SMTP id e15mr26721682pln.44.1491286710193; Mon, 03 Apr 2017 23:18:30 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id m20sm29331500pgd.32.2017.04.03.23.18.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Apr 2017 23:18:29 -0700 (PDT) From: Amit Pundir To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= , Kalle Valo Subject: [PATCH 28/33] brcmfmac: merge two remaining brcmf_err macros Date: Tue, 4 Apr 2017 11:48:07 +0530 Message-Id: <1491286688-31314-9-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1491286688-31314-1-git-send-email-amit.pundir@linaro.org> References: <1491286688-31314-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)