From patchwork Wed Apr 5 10:32:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Amit Pundir X-Patchwork-Id: 96817 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp196072qgd; Wed, 5 Apr 2017 03:33:34 -0700 (PDT) X-Received: by 10.84.164.106 with SMTP id m39mr35885881plg.9.1491388414653; Wed, 05 Apr 2017 03:33:34 -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.34; Wed, 05 Apr 2017 03:33:34 -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 S933477AbdDEKdd (ORCPT + 6 others); Wed, 5 Apr 2017 06:33:33 -0400 Received: from mail-pg0-f43.google.com ([74.125.83.43]:35234 "EHLO mail-pg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933485AbdDEKdZ (ORCPT ); Wed, 5 Apr 2017 06:33:25 -0400 Received: by mail-pg0-f43.google.com with SMTP id 81so6031351pgh.2 for ; Wed, 05 Apr 2017 03:33:24 -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=fokY1GsduFBds/k77siHsDGemCGdOJb8EJ0OnKUTxh8=; b=X+fWHBMMrk3UBlgI5Y+UYyGvSi+yZSJZ6QOr8avcHywVAZXN8/8rfIi+RrFVTDXpPB muybOYIQMCioHtIzDRNg6foKTuHyb0VR28pAW18lnoRm4d+gI7RpokiGbnlhFId9nCcC ndhhYKkzvF7Zj9ryaaI60muWh89T4FhaV4n0c= 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=fokY1GsduFBds/k77siHsDGemCGdOJb8EJ0OnKUTxh8=; b=Jy74S6x3A1IeZ99z2yXZEKs6yCuUa/DrSDA82rgymEGbfRe5tAnlzoSJhcVisDx22s 437f7RQQPZi9bZMklvI0hiJDHBFvkIfgEjkcFD48jvWz3CkemxAZggEed7pwWfyky3PY WtyEku3OQL0ubVlbYtJNGSQMIKe4LTEVCOIfcIFgb7VHcJJVmOF3ToLAiWL5EcOowMC4 6LTYtTj6rKSdQ9VDtUVLZtRrOv5kq/iTeAzkm2p3PqP31d0fAUXovXqIvvrnv+nynNpx URH+EjNisBcfH4J/07bjwvGSse9aT8kmPSUrm3Dz9Saccpdh5TX7ckz97kiN3P7w9HXw +YSg== X-Gm-Message-State: AFeK/H37fs0iXvC44H+HhIpiryjlkOIe/LIBkGtAgq9votg/KhRtfjiBuFIWA0TcjH9/CZN1 X-Received: by 10.84.212.130 with SMTP id e2mr35818103pli.140.1491388403348; Wed, 05 Apr 2017 03:33:23 -0700 (PDT) Received: from localhost.localdomain ([106.51.240.246]) by smtp.gmail.com with ESMTPSA id a62sm36732075pgc.60.2017.04.05.03.33.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Apr 2017 03:33:22 -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 26/32] brcmfmac: switch to C function (__brcmf_err) for printing errors Date: Wed, 5 Apr 2017 16:02:18 +0530 Message-Id: <1491388344-13521-27-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 will allow extending code and using more detailed messages e.g. with the help of dev_err. Signed-off-by: Rafał Miłecki Acked-by: Arend van Spriel Signed-off-by: Kalle Valo (cherry picked from commit 087fa712a00685dac4bcc64b7c3dc8ae6bee8026) Signed-off-by: Amit Pundir --- .../net/wireless/broadcom/brcm80211/brcmfmac/common.c | 16 ++++++++++++++++ drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h | 6 +++--- 2 files changed, 19 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 3e15d64..2dcca71 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -218,6 +218,22 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) return err; } +#ifndef CONFIG_BRCM_TRACING +void __brcmf_err(const char *func, const char *fmt, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + pr_err("%s: %pV", func, &vaf); + + va_end(args); +} +#endif + #if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG) void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...) { diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h index 1fe4aa9..441a666 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h @@ -45,6 +45,8 @@ #undef pr_fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +__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 @@ -53,11 +55,9 @@ #define brcmf_err(fmt, ...) \ do { \ if (IS_ENABLED(CONFIG_BRCMDBG) || net_ratelimit()) \ - pr_err("%s: " fmt, __func__, ##__VA_ARGS__); \ + __brcmf_err(__func__, fmt, ##__VA_ARGS__); \ } while (0) #else -__printf(2, 3) -void __brcmf_err(const char *func, const char *fmt, ...); #define brcmf_err(fmt, ...) \ __brcmf_err(__func__, fmt, ##__VA_ARGS__) #endif