commit 46a5ebaf02d69e26ee0f47a0b8d2d9bc619240d4
author Johannes Berg <johannes.berg@intel.com> Wed Sep 15 13:28:15 2010 +0200
committer John W. Linville <linville@tuxdriver.com> Thu Sep 16 15:46:00 2010 -0400
tree 77bc5ceee61ce125c4b608d7b979bf8d033ffdcc
parent f5521b13880f4f4f612e1d20dd4f565122d16e04

cfg80211/mac80211: use lockdep_assert_held

Instead of using a WARN_ON(!mutex_is_locked())
use lockdep_assert_held() which compiles away
completely when lockdep isn't enabled, and
also is a more accurate assertion since it
checks that the current thread is holding the
mutex.

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

net/wireless/reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index b0d9a08..d14bbf9 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -74,7 +74,11 @@
  *     - last_request
  */
 static DEFINE_MUTEX(reg_mutex);
-#define assert_reg_lock() WARN_ON(!mutex_is_locked(&reg_mutex))
+
+static inline void assert_reg_lock(void)
+{
+	lockdep_assert_held(&reg_mutex);
+}
 
 /* Used to queue up regulatory hints */
 static LIST_HEAD(reg_requests_list);