diff --git a/drivers/base/core.c b/drivers/base/core.c
index 76513e360496..b69b82da8837 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -4898,16 +4898,8 @@ void device_shutdown(void)
 
 		idx = device_links_read_lock();
 		list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,
-				device_links_read_lock_held()) {
-			/*
-			 * sync_state_only suppliers don't need to wait,
-			 * aren't reordered on devices_kset, so making them
-			 * wait could result in a hang
-			 */
-			if (device_link_flag_is_sync_state_only(link->flags))
-				continue;
+				device_links_read_lock_held())
 			link->supplier->p->shutdown_after = cookie;
-		}
 		device_links_read_unlock(idx);
 		put_device(dev);