From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lf0-f67.google.com ([209.85.215.67]:34048 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553AbdBBMR2 (ORCPT ); Thu, 2 Feb 2017 07:17:28 -0500 Received: by mail-lf0-f67.google.com with SMTP id q89so1232937lfi.1 for ; Thu, 02 Feb 2017 04:17:27 -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 V2 7/7] brcmfmac: use dev_err to print errors Date: Thu, 2 Feb 2017 13:16:59 +0100 Message-Id: <20170202121659.21130-7-zajec5@gmail.com> (sfid-20170202_131732_930235_0EEEDF15) In-Reply-To: <20170202121659.21130-1-zajec5@gmail.com> References: <20170202121659.21130-1-zajec5@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Rafał Miłecki This adds a nice prefix to all error messages making it possible to identify device they are related to. It's really useful for e.g. home routers commonly having 2 or even 3 wireless devices. Signed-off-by: Rafał Miłecki --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 3 ++- drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index 9ad9bd652ca2..28b08cba7dbe 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -223,6 +223,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) #ifndef CONFIG_BRCM_TRACING void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...) { + struct device *dev = pub && pub->bus_if ? pub->bus_if->dev : NULL; struct va_format vaf; va_list args; @@ -233,7 +234,7 @@ void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...) vaf.fmt = fmt; vaf.va = &args; - pr_err("%s: %pV", func, &vaf); + dev_err(dev, "%s: %pV", func, &vaf); va_end(args); } diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c index 329cb65eb78b..393c1b31ed28 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c @@ -25,6 +25,7 @@ void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...) { + struct device *dev = pub && pub->bus_if ? pub->bus_if->dev : NULL; struct va_format vaf = { .fmt = fmt, }; @@ -32,7 +33,7 @@ void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...) va_start(args, fmt); vaf.va = &args; - pr_err("%s: %pV", func, &vaf); + dev_err(dev, "%s: %pV", func, &vaf); trace_brcmf_err(func, &vaf); va_end(args); } -- 2.11.0