Commit 3b052a3e authored by Saravana Kannan's avatar Saravana Kannan Committed by Greg Kroah-Hartman
Browse files

Revert "driver core: Rename dev_links_info.defer_sync to defer_hook" 



This reverts commit ec7bd784.

This field rename was done to reuse defer_syc list head for multiple
lists. That's not needed anymore and this list head will only be used
for defer sync. So revert this patch to avoid conflicts with the other
reverts coming after this.

Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20201121020232.908850-3-saravanak@google.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c95d6401

drivers/base/core.c

+11 −11
Original line number Diff line number Diff line
@@ -959,11 +959,11 @@ static void __device_links_queue_sync_state(struct device *dev, 
	 */

	dev->state_synced = true;



	if (WARN_ON(!list_empty(&dev->links.defer_hook)))

	if (WARN_ON(!list_empty(&dev->links.defer_sync)))

		return;



	get_device(dev);

	list_add_tail(&dev->links.defer_hook, list);

	list_add_tail(&dev->links.defer_sync, list);

}



/**
@@ -981,8 +981,8 @@ static void device_links_flush_sync_list(struct list_head *list, 
{

	struct device *dev, *tmp;



	list_for_each_entry_safe(dev, tmp, list, links.defer_hook) {

		list_del_init(&dev->links.defer_hook);

	list_for_each_entry_safe(dev, tmp, list, links.defer_sync) {

		list_del_init(&dev->links.defer_sync);



		if (dev != dont_lock_dev)

			device_lock(dev);
@@ -1020,12 +1020,12 @@ void device_links_supplier_sync_state_resume(void) 
	if (defer_sync_state_count)

		goto out;



	list_for_each_entry_safe(dev, tmp, &deferred_sync, links.defer_hook) {

	list_for_each_entry_safe(dev, tmp, &deferred_sync, links.defer_sync) {

		/*

		 * Delete from deferred_sync list before queuing it to

		 * sync_list because defer_hook is used for both lists.

		 * sync_list because defer_sync is used for both lists.

		 */

		list_del_init(&dev->links.defer_hook);

		list_del_init(&dev->links.defer_sync);

		__device_links_queue_sync_state(dev, &sync_list);

	}

out:
@@ -1043,8 +1043,8 @@ late_initcall(sync_state_resume_initcall); 


static void __device_links_supplier_defer_sync(struct device *sup)

{

	if (list_empty(&sup->links.defer_hook) && dev_has_sync_state(sup))

		list_add_tail(&sup->links.defer_hook, &deferred_sync);

	if (list_empty(&sup->links.defer_sync) && dev_has_sync_state(sup))

		list_add_tail(&sup->links.defer_sync, &deferred_sync);

}



static void device_link_drop_managed(struct device_link *link)
@@ -1272,7 +1272,7 @@ void device_links_driver_cleanup(struct device *dev) 
		WRITE_ONCE(link->status, DL_STATE_DORMANT);

	}



	list_del_init(&dev->links.defer_hook);

	list_del_init(&dev->links.defer_sync);

	__device_links_no_driver(dev);



	device_links_write_unlock();
@@ -2405,7 +2405,7 @@ void device_initialize(struct device *dev) 
	INIT_LIST_HEAD(&dev->links.consumers);

	INIT_LIST_HEAD(&dev->links.suppliers);

	INIT_LIST_HEAD(&dev->links.needs_suppliers);

	INIT_LIST_HEAD(&dev->links.defer_hook);

	INIT_LIST_HEAD(&dev->links.defer_sync);

	dev->links.status = DL_DEV_NO_DRIVER;

}

EXPORT_SYMBOL_GPL(device_initialize);

include/linux/device.h

+2 −2
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ enum dl_dev_state { 
 * @suppliers: List of links to supplier devices.

 * @consumers: List of links to consumer devices.

 * @needs_suppliers: Hook to global list of devices waiting for suppliers.

 * @defer_hook: Hook to global list of devices that have deferred sync_state.

 * @defer_sync: Hook to global list of devices that have deferred sync_state.

 * @need_for_probe: If needs_suppliers is on a list, this indicates if the

 *		    suppliers are needed for probe or not.

 * @status: Driver status information.
@@ -361,7 +361,7 @@ struct dev_links_info { 
	struct list_head suppliers;

	struct list_head consumers;

	struct list_head needs_suppliers;

	struct list_head defer_hook;

	struct list_head defer_sync;

	bool need_for_probe;

	enum dl_dev_state status;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE