Browse Source

brcmfmac: (clean) Move tracepoint related function.

__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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Hante Meuleman 10 years ago
parent
commit
4a1c61508b

+ 0 - 15
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c

@@ -201,21 +201,6 @@ done:
 	return err;
 	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)
 #if defined(CONFIG_BRCM_TRACING) || defined(CONFIG_BRCMDBG)
 void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
 void __brcmf_dbg(u32 level, const char *func, const char *fmt, ...)
 {
 {

+ 15 - 0
drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c

@@ -19,4 +19,19 @@
 #ifndef __CHECKER__
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
 #define CREATE_TRACE_POINTS
 #include "tracepoint.h"
 #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
 #endif