Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-block.git] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index f9297c68214ae47db140860222f4bcf5e709d85f..e54a10b5dbd713d1ea1f29f4634f1af4be284b27 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -247,7 +247,6 @@ static void __fw_devlink_pickup_dangling_consumers(struct fwnode_handle *fwnode,
                __fw_devlink_pickup_dangling_consumers(child, new_sup);
 }
 
-#ifdef CONFIG_SRCU
 static DEFINE_MUTEX(device_links_lock);
 DEFINE_STATIC_SRCU(device_links_srcu);
 
@@ -286,47 +285,6 @@ static void device_link_remove_from_lists(struct device_link *link)
        list_del_rcu(&link->s_node);
        list_del_rcu(&link->c_node);
 }
-#else /* !CONFIG_SRCU */
-static DECLARE_RWSEM(device_links_lock);
-
-static inline void device_links_write_lock(void)
-{
-       down_write(&device_links_lock);
-}
-
-static inline void device_links_write_unlock(void)
-{
-       up_write(&device_links_lock);
-}
-
-int device_links_read_lock(void)
-{
-       down_read(&device_links_lock);
-       return 0;
-}
-
-void device_links_read_unlock(int not_used)
-{
-       up_read(&device_links_lock);
-}
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-int device_links_read_lock_held(void)
-{
-       return lockdep_is_held(&device_links_lock);
-}
-#endif
-
-static inline void device_link_synchronize_removal(void)
-{
-}
-
-static void device_link_remove_from_lists(struct device_link *link)
-{
-       list_del(&link->s_node);
-       list_del(&link->c_node);
-}
-#endif /* !CONFIG_SRCU */
 
 static bool device_is_ancestor(struct device *dev, struct device *target)
 {