mac80211: remove tracing config symbol

There's little point in this config symbol, if
tracing is disabled the overhead is negligible
and if you think it's too bad you can always
turn off tracing completely.

Also remove the part where we don't have sparse
check the tracing code -- it seems that it can
now deal with it (or the code changed).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 7d3b438755f01d944615ffa03e11f14895591b29..96ddb72760b9652bce8ab7e87ef5f62de6d2bffb 100644 (file)
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -247,15 +247,3 @@ config MAC80211_DEBUG_COUNTERS
          and show them in debugfs.
 
          If unsure, say N.
-
-config MAC80211_DRIVER_API_TRACER
-       bool "Driver API tracer"
-       depends on MAC80211_DEBUG_MENU
-       depends on EVENT_TRACING
-       help
-         Say Y here to make mac80211 register with the ftrace
-         framework for the driver API -- you can then see which
-         driver methods it is calling and which API functions
-         drivers are calling by looking at the trace.
-
-         If unsure, say Y.

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index fdb54e61d637d74ce81c45211f7334eabdc21dce..d540c3b160f37fde53c1cbdc867291849b0d08fa 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -24,7 +24,8 @@ mac80211-y := \
        util.o \
        wme.o \
        event.o \
-       chan.o
+       chan.o \
+       driver-trace.o
 
 mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
@@ -41,7 +42,6 @@ mac80211-$(CONFIG_MAC80211_MESH) += \
 
 mac80211-$(CONFIG_PM) += pm.o
 
-mac80211-$(CONFIG_MAC80211_DRIVER_API_TRACER) += driver-trace.o
 CFLAGS_driver-trace.o := -I$(src)
 
 # objects for PID algorithm

diff --git a/net/mac80211/driver-trace.h b/net/mac80211/driver-trace.h
index 2af4fca553371f3c4a6a7263ade75f9f6342002a..6e9df8fd8fb8c7d04e2d834232152a0377952823 100644 (file)
--- a/net/mac80211/driver-trace.h
+++ b/net/mac80211/driver-trace.h
@@ -5,17 +5,6 @@
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
 
-#if !defined(CONFIG_MAC80211_DRIVER_API_TRACER) || defined(__CHECKER__)
-#undef TRACE_EVENT
-#define TRACE_EVENT(name, proto, ...) \
-static inline void trace_ ## name(proto) {}
-#undef DECLARE_EVENT_CLASS
-#define DECLARE_EVENT_CLASS(...)
-#undef DEFINE_EVENT
-#define DEFINE_EVENT(evt_class, name, proto, ...) \
-static inline void trace_ ## name(proto) {}
-#endif
-
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM mac80211