cfg80211: use lockdep to assert lock is held

Instead of annotating with a comment, add a lockdep
annotation which also serves as documentation.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 1494d947e8ddf98d1eaf7a27ba3a28845f5e8d62..a56287bb550c0223db1ee7dc7f87a93466a38714 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -41,22 +41,24 @@ static void bss_release(struct kref *ref)
        kfree(bss);
 }
 
-/* must hold dev->bss_lock! */
 static void __cfg80211_unlink_bss(struct cfg80211_registered_device *dev,
                                  struct cfg80211_internal_bss *bss)
 {
+       lockdep_assert_held(&dev->bss_lock);
+
        list_del_init(&bss->list);
        rb_erase(&bss->rbn, &dev->bss_tree);
        kref_put(&bss->ref, bss_release);
 }
 
-/* must hold dev->bss_lock! */
 static void __cfg80211_bss_expire(struct cfg80211_registered_device *dev,
                                  unsigned long expire_time)
 {
        struct cfg80211_internal_bss *bss, *tmp;
        bool expired = false;
 
+       lockdep_assert_held(&dev->bss_lock);
+
        list_for_each_entry_safe(bss, tmp, &dev->bss_list, list) {
                if (atomic_read(&bss->hold))
                        continue;