From 15e3e7402cb40edba9899c325fdfea4c8ba3ef6b Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 25 Nov 2011 13:31:53 +0100
Subject: [PATCH] --- yaml --- r: 278429 b: refs/heads/master c:
 61c0d48f1565efdbab1e913c3cfda997e6299c41 h: refs/heads/master i:   278427:
 3bfab94a4a84fad7ca6f4f973027c43447a3133f v: v3

---
 [refs]                            |  2 +-
 trunk/net/mac80211/Kconfig        | 12 ------------
 trunk/net/mac80211/Makefile       |  4 ++--
 trunk/net/mac80211/driver-trace.h | 11 -----------
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index d2ed7309758c..4923902bfeb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30789eb6cbfcead5d90d27dc4e7d7389cacc528c
+refs/heads/master: 61c0d48f1565efdbab1e913c3cfda997e6299c41
diff --git a/trunk/net/mac80211/Kconfig b/trunk/net/mac80211/Kconfig
index 7d3b438755f0..96ddb72760b9 100644
--- a/trunk/net/mac80211/Kconfig
+++ b/trunk/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/trunk/net/mac80211/Makefile b/trunk/net/mac80211/Makefile
index fdb54e61d637..d540c3b160f3 100644
--- a/trunk/net/mac80211/Makefile
+++ b/trunk/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/trunk/net/mac80211/driver-trace.h b/trunk/net/mac80211/driver-trace.h
index 2af4fca55337..6e9df8fd8fb8 100644
--- a/trunk/net/mac80211/driver-trace.h
+++ b/trunk/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