smsc: Replace spin_is_locked() with lockdep
authorLance Roy <ldr709@gmail.com>
Fri, 5 Oct 2018 06:45:42 +0000 (23:45 -0700)
committerPaul E. McKenney <paulmck@linux.ibm.com>
Mon, 12 Nov 2018 17:06:22 +0000 (09:06 -0800)
lockdep_assert_held() is better suited to checking locking requirements,
since it only checks if the current thread holds the lock regardless of
whether someone else does. This is also a step towards possibly removing
spin_is_locked().

Signed-off-by: Lance Roy <ldr709@gmail.com>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
drivers/net/ethernet/smsc/smsc911x.h

index 8d75508acd2bfad7c7915b955f40168591d47385..51b2fc1a395f17757bea84276a9ff1db27afad47 100644 (file)
@@ -67,7 +67,7 @@
 
 #ifdef CONFIG_DEBUG_SPINLOCK
 #define SMSC_ASSERT_MAC_LOCK(pdata) \
-               WARN_ON_SMP(!spin_is_locked(&pdata->mac_lock))
+               lockdep_assert_held(&pdata->mac_lock)
 #else
 #define SMSC_ASSERT_MAC_LOCK(pdata) do {} while (0)
 #endif                         /* CONFIG_DEBUG_SPINLOCK */