Skip to content

Commit

Permalink
mac80211: remove tracing config symbol
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed Nov 28, 2011
1 parent 30789eb commit 61c0d48
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 25 deletions.
12 changes: 0 additions & 12 deletions net/mac80211/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions net/mac80211/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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) += \
Expand All @@ -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
Expand Down
11 changes: 0 additions & 11 deletions net/mac80211/driver-trace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 61c0d48

Please sign in to comment.