Skip to content

Commit ec7bd78

Browse files
Saravana Kannangregkh
authored andcommitted
driver core: Rename dev_links_info.defer_sync to defer_hook
The defer_sync field is used as a hook to add the device to the deferred_sync list. Rename it so that it's more meaningful for the next patch that'll also use this field as a hook to a deferred_fw_devlink list. Signed-off-by: Saravana Kannan <[email protected]> Reviewed-by: Rafael J. Wysocki <[email protected]> Tested-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent cec72f3 commit ec7bd78

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

drivers/base/core.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -754,11 +754,11 @@ static void __device_links_queue_sync_state(struct device *dev,
754754
*/
755755
dev->state_synced = true;
756756

757-
if (WARN_ON(!list_empty(&dev->links.defer_sync)))
757+
if (WARN_ON(!list_empty(&dev->links.defer_hook)))
758758
return;
759759

760760
get_device(dev);
761-
list_add_tail(&dev->links.defer_sync, list);
761+
list_add_tail(&dev->links.defer_hook, list);
762762
}
763763

764764
/**
@@ -776,8 +776,8 @@ static void device_links_flush_sync_list(struct list_head *list,
776776
{
777777
struct device *dev, *tmp;
778778

779-
list_for_each_entry_safe(dev, tmp, list, links.defer_sync) {
780-
list_del_init(&dev->links.defer_sync);
779+
list_for_each_entry_safe(dev, tmp, list, links.defer_hook) {
780+
list_del_init(&dev->links.defer_hook);
781781

782782
if (dev != dont_lock_dev)
783783
device_lock(dev);
@@ -815,12 +815,12 @@ void device_links_supplier_sync_state_resume(void)
815815
if (defer_sync_state_count)
816816
goto out;
817817

818-
list_for_each_entry_safe(dev, tmp, &deferred_sync, links.defer_sync) {
818+
list_for_each_entry_safe(dev, tmp, &deferred_sync, links.defer_hook) {
819819
/*
820820
* Delete from deferred_sync list before queuing it to
821-
* sync_list because defer_sync is used for both lists.
821+
* sync_list because defer_hook is used for both lists.
822822
*/
823-
list_del_init(&dev->links.defer_sync);
823+
list_del_init(&dev->links.defer_hook);
824824
__device_links_queue_sync_state(dev, &sync_list);
825825
}
826826
out:
@@ -838,8 +838,8 @@ late_initcall(sync_state_resume_initcall);
838838

839839
static void __device_links_supplier_defer_sync(struct device *sup)
840840
{
841-
if (list_empty(&sup->links.defer_sync) && dev_has_sync_state(sup))
842-
list_add_tail(&sup->links.defer_sync, &deferred_sync);
841+
if (list_empty(&sup->links.defer_hook) && dev_has_sync_state(sup))
842+
list_add_tail(&sup->links.defer_hook, &deferred_sync);
843843
}
844844

845845
static void device_link_drop_managed(struct device_link *link)
@@ -1052,7 +1052,7 @@ void device_links_driver_cleanup(struct device *dev)
10521052
WRITE_ONCE(link->status, DL_STATE_DORMANT);
10531053
}
10541054

1055-
list_del_init(&dev->links.defer_sync);
1055+
list_del_init(&dev->links.defer_hook);
10561056
__device_links_no_driver(dev);
10571057

10581058
device_links_write_unlock();
@@ -2171,7 +2171,7 @@ void device_initialize(struct device *dev)
21712171
INIT_LIST_HEAD(&dev->links.consumers);
21722172
INIT_LIST_HEAD(&dev->links.suppliers);
21732173
INIT_LIST_HEAD(&dev->links.needs_suppliers);
2174-
INIT_LIST_HEAD(&dev->links.defer_sync);
2174+
INIT_LIST_HEAD(&dev->links.defer_hook);
21752175
dev->links.status = DL_DEV_NO_DRIVER;
21762176
}
21772177
EXPORT_SYMBOL_GPL(device_initialize);

include/linux/device.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ enum dl_dev_state {
433433
* @suppliers: List of links to supplier devices.
434434
* @consumers: List of links to consumer devices.
435435
* @needs_suppliers: Hook to global list of devices waiting for suppliers.
436-
* @defer_sync: Hook to global list of devices that have deferred sync_state.
436+
* @defer_hook: Hook to global list of devices that have deferred sync_state.
437437
* @need_for_probe: If needs_suppliers is on a list, this indicates if the
438438
* suppliers are needed for probe or not.
439439
* @status: Driver status information.
@@ -442,7 +442,7 @@ struct dev_links_info {
442442
struct list_head suppliers;
443443
struct list_head consumers;
444444
struct list_head needs_suppliers;
445-
struct list_head defer_sync;
445+
struct list_head defer_hook;
446446
bool need_for_probe;
447447
enum dl_dev_state status;
448448
};

0 commit comments

Comments
 (0)