[tip:core/rcu] smsc: Replace spin_is_locked() with lockdep
From: tip-bot for Lance Roy <hidden>
Date: 2018-12-04 22:34:27
Subsystem:
networking drivers, smsc911x ethernet driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Steve Glendinning, Linus Torvalds
Commit-ID: 97eeebea894283c290ead6694b76f575e7654773 Gitweb: https://git.kernel.org/tip/97eeebea894283c290ead6694b76f575e7654773 Author: Lance Roy [off-list ref] AuthorDate: Thu, 4 Oct 2018 23:45:42 -0700 Committer: Paul E. McKenney [off-list ref] CommitDate: Mon, 12 Nov 2018 09:06:22 -0800 smsc: Replace spin_is_locked() with lockdep 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 <redacted> Cc: Steve Glendinning <steve.glendinning@shawell.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: <redacted> Signed-off-by: Paul E. McKenney <redacted> --- drivers/net/ethernet/smsc/smsc911x.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
index 8d75508acd2b..51b2fc1a395f 100644
--- a/drivers/net/ethernet/smsc/smsc911x.h
+++ b/drivers/net/ethernet/smsc/smsc911x.h@@ -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 */