From patchwork Thu Feb 2 21:33:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= X-Patchwork-Id: 9553253 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C373A60405 for ; Thu, 2 Feb 2017 21:33:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B6C6F28499 for ; Thu, 2 Feb 2017 21:33:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ABA20284BC; Thu, 2 Feb 2017 21:33:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5ECA228499 for ; Thu, 2 Feb 2017 21:33:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751881AbdBBVdm (ORCPT ); Thu, 2 Feb 2017 16:33:42 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34410 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751298AbdBBVdk (ORCPT ); Thu, 2 Feb 2017 16:33:40 -0500 Received: by mail-lf0-f65.google.com with SMTP id q89so46661lfi.1 for ; Thu, 02 Feb 2017 13:33:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rJwxH92LOKolstB2NWfTVgFBFm4Dqa8+BlK6kGtw5mM=; b=Nz2Nmc9XUVGawbBY/fvxIcjw1ygP83b+Pfd9B0UQAGZZQ+sxX2kTbu8QxYy2r7o9mQ /MvU1Q4F7o7BTrfnkQt6Iu7fnKOhNgSvibZSTOeVEJfduebKKM2tDprBkBvl8QB5aicr r6HXOORJFkTxbT/a9xobNabAzg+sqRE/aiM3vaoJFXg7QmNuWmMqdXVmq1Kui7SB8CAj c5NiwOsvVEVusdo2WPbEcJqq9hAJsIIs//MwX8I97g9dqBiFd+ko3CUu4YkTlZQWoR+r XZ45KhuPtY6m2TD4y1FLuBLDTsyuWD+hWARLwvTH3gMmFDtEiuBRvHQsRVWWbx4Zk898 qggg== 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=rJwxH92LOKolstB2NWfTVgFBFm4Dqa8+BlK6kGtw5mM=; b=Y75yav0SaFRlY2T+221YB/CZKOVeBYwxVQ4FNk2/UkUY7uaomM5dGMqpFFDK64SWSi jy8F5BoLuRmk4msXicEIrH297zNHFa6QPD82mVqiSIlgORlBafx/VmGcTB1DejZ3KN5V KuUqaTB7A/ECN2o6JJDAmdbRPpzO/xZIsxS3NHEtBWdNRYLOWza4zyLNl7TEvhk0iZdw pbUwXW/6ZPgTxG2mrH4Ud04DYJik6zF05tp8qBvPFA4Xt9UnUS3Ow25GERrsY6e5GpGp k5iyvylqN39qISFQelJ5D1ESe4ZeABjh5brDWWZYilB0Ou4jp5eFB3jBU4ExOPof5g4u ii2w== X-Gm-Message-State: AIkVDXJa38V80Y+ea24T0XKQ49tsuFBFsMk/07bQ8z65F5POtOkuKNdFx7G4QWXhXYrzBw== X-Received: by 10.25.43.8 with SMTP id r8mr3311697lfr.26.1486071218846; Thu, 02 Feb 2017 13:33:38 -0800 (PST) Received: from linux-samsung.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id 1sm2590003ljv.40.2017.02.02.13.33.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Feb 2017 13:33:38 -0800 (PST) From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= To: Kalle Valo Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Subject: [PATCH V3 3/9] brcmfmac: merge two remaining brcmf_err macros Date: Thu, 2 Feb 2017 22:33:15 +0100 Message-Id: <20170202213321.11591-3-zajec5@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170202213321.11591-1-zajec5@gmail.com> References: <20170202213321.11591-1-zajec5@gmail.com> MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- V3: Add this (new) patch --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h index 441a6661eac0..066126123e96 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)