From patchwork Wed Apr 5 10:32:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96818 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196081qgd; Wed, 5 Apr 2017 03:33:35 -0700 (PDT) X-Received: by 10.98.80.209 with SMTP id g78mr28037618pfj.163.1491388415504; Wed, 05 Apr 2017 03:33:35 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si20271056pli.143.2017.04.05.03.33.35; Wed, 05 Apr 2017 03:33:35 -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 S933485AbdDEKdd (ORCPT + 6 others); Wed, 5 Apr 2017 06:33:33 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:35464 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933484AbdDEKdZ (ORCPT ); Wed, 5 Apr 2017 06:33:25 -0400 Received: by mail-pf0-f176.google.com with SMTP id i5so5591945pfc.2 for ; Wed, 05 Apr 2017 03:33:21 -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=DD6O32VKunMiV1g5HyDlQRPVVld62FXY6h9wIHMkfRQ=; b=ioWKcTkgd/iwgICUp8pCoN/wM1nsRmu/2pOCnUR3mqWpboTaAKnMtTMm0n6hqISkfS IPhrxlPpmw/9xO5m6lm0hZ3J0WsW3Il/IQOGvM3A6zuUwwgA4Lnxm4tjehm+nnhClmAa kTc4hkYzsGaJncgePTx3Q1jnFMEirOr8C7eGA= 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=DD6O32VKunMiV1g5HyDlQRPVVld62FXY6h9wIHMkfRQ=; b=eivBxfT7CFnfX3q4znRtMIyRQ6eLokLFj8wRGKzBYZkf98bDH89bUBU3HCTHtlpfIv 26BDbvieNn5QirbKlWkOqp2ssGhLVasSWeFrTkMBSlcdmQ2T51T+id8LZo09hNCn7JZ9 IJRttJZuoP77E/mL4CWLCODVNglRG9haelybB6d8AkT2iEW5DPMFDDOx3p4i2Gh6W4ez LiPbyE0wqTfOs4MsakR1/jJnT8B05UI2+YLlvOhX8bW3gCGaqwTPxWArZ5vpHfP+HMB7 QzdVdKaAJty5+VYHoybh5Qrv884lGm6X28v4vxwCLqw+YA3m3R7tbfpaW81j7RPaULMB qDcQ== X-Gm-Message-State: AFeK/H1lUAxoy6SRooho13mMhMa/OJtSapUYcfH3QXYQqfJpJ2lBVunRED+2ShBHxLnPflNp X-Received: by 10.98.86.152 with SMTP id h24mr29142038pfj.184.1491388401273; Wed, 05 Apr 2017 03:33:21 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:20 -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 25/32] brcmfmac: merge two brcmf_err macros into one Date: Wed, 5 Apr 2017 16:02:17 +0530 Message-Id: <1491388344-13521-26-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 This allows simplifying the code by adding a simple IS_ENABLED check for CONFIG_BRCMDB symbol. Signed-off-by: Rafał Miłecki Acked-by: Arend van Spriel Signed-off-by: Kalle Valo (cherry picked from commit 9587a01a7ead9efc5032c16e0d9668de58be1186) Signed-off-by: Amit Pundir --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 8 ++------ 1 file changed, 2 insertions(+), 6 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 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, ...);