From: Arend van Spriel <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
Hante Meuleman <meuleman@broadcom.com>,
Arend van Spriel <arend@broadcom.com>
Subject: [PATCH 09/16] brcmfmac: (clean) Move tracepoint related function.
Date: Tue, 28 Oct 2014 14:56:12 +0100 [thread overview]
Message-ID: <1414504579-12562-10-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1414504579-12562-1-git-send-email-arend@broadcom.com>
From: Hante Meuleman <meuleman@broadcom.com>
__brcmf_err is a tracepoint specific function. Move it to
tracepoint.c.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | 15 ---------------
drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c | 16 ++++++++++++++++
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 6028fc4..98bc222 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -201,21 +201,6 @@ done:
return err;
}
-#ifdef CONFIG_BRCM_TRACING
-void __brcmf_err(const char *func, const char *fmt, ...)
-{
- struct va_format vaf = {
- .fmt = fmt,
- };
- va_list args;
-
- va_start(args, fmt);
- vaf.va = &args;
- pr_err("%s: %pV", func, &vaf);
- trace_brcmf_err(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/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
index b505db4..b4cdccd 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c
@@ -19,4 +19,20 @@
#ifndef __CHECKER__
#define CREATE_TRACE_POINTS
#include "tracepoint.h"
+
+void __brcmf_err(const char *func, const char *fmt, ...)
+{
+ struct va_format vaf = {
+ .fmt = fmt,
+ };
+ va_list args;
+
+ va_start(args, fmt);
+ vaf.va = &args;
+ pr_err("%s: %pV", func, &vaf);
+ trace_brcmf_err(func, &vaf);
+ va_end(args);
+}
+
#endif
+
--
1.9.1
next prev parent reply other threads:[~2014-10-28 13:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 13:56 [PATCH 00/16] brcmfmac: wowl support and cleanup Arend van Spriel
2014-10-28 13:56 ` [PATCH 01/16] brcmfmac: Add wowl support for USB devices Arend van Spriel
2014-10-28 13:56 ` [PATCH 02/16] brcmfmac: Add wowl support for SDIO devices Arend van Spriel
2014-10-28 13:56 ` [PATCH 03/16] brcmfmac: Add wowl patterns support Arend van Spriel
2014-10-28 13:56 ` [PATCH 04/16] brcmfmac: show firmware error as string in debug message Arend van Spriel
2014-10-28 13:56 ` [PATCH 05/16] brcmfmac: remove unused defintion Arend van Spriel
2014-10-28 13:56 ` [PATCH 06/16] brcmfmac: do not use firmware error code in driver Arend van Spriel
2014-10-28 13:56 ` [PATCH 07/16] brcmfmac: (clean) Remove usb_rdl.h as it is not needed Arend van Spriel
2014-10-28 13:56 ` [PATCH 08/16] brcmfmac: (clean) Remove packet filter configuration Arend van Spriel
2014-10-28 13:56 ` Arend van Spriel [this message]
2014-10-28 13:56 ` [PATCH 10/16] brcmfmac: (clean) Rename files dhd_dbg to debug Arend van Spriel
2014-10-28 13:56 ` [PATCH 11/16] brcmfmac: (clean) Rename dhd_bus.h in bus.h Arend van Spriel
2014-10-28 13:56 ` [PATCH 12/16] brcmfmac: (clean) Rename dhd_common.c in common.c Arend van Spriel
2014-10-28 13:56 ` [PATCH 13/16] brcmfmac: (clean) Rename files wl_cfg80211 to cfg80211 Arend van Spriel
2014-10-28 13:56 ` [PATCH 14/16] brcmfmac: (clean) Rename sdio related files Arend van Spriel
2014-10-28 13:56 ` [PATCH 15/16] " Arend van Spriel
2014-10-28 13:56 ` [PATCH 16/16] brcmfmac: (clean) Move sdio related function Arend van Spriel
2014-10-28 14:54 ` [PATCH 00/16] brcmfmac: wowl support and cleanup Joe Perches
2014-10-29 8:31 ` Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1414504579-12562-10-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=meuleman@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).