Re: [PATCH v1 2/3] driver core: Rename dev_links_info.defer_sync to defer_hook

[Rafael J. Wysocki]

On Wed, Jul 1, 2020 at 9:43 PM Saravana Kannan <saravanak@xxxxxxxxxx> wrote:
>
> 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 <saravanak@xxxxxxxxxx>

This is a trivial rename if I'm not mistaken, so

Reviewed-by: Rafael J. Wysocki <rafael@xxxxxxxxxx>


> ---
>  drivers/base/core.c    | 22 +++++++++++-----------
>  include/linux/device.h |  4 ++--
>  2 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/base/core.c b/drivers/base/core.c
> index 35cc9896eb9e..d1d2cdc3a8d8 100644
> --- a/drivers/base/core.c
> +++ b/drivers/base/core.c
> @@ -754,11 +754,11 @@ static void __device_links_queue_sync_state(struct device *dev,
>          */
>         dev->state_synced = true;
>
> -       if (WARN_ON(!list_empty(&dev->links.defer_sync)))
> +       if (WARN_ON(!list_empty(&dev->links.defer_hook)))
>                 return;
>
>         get_device(dev);
> -       list_add_tail(&dev->links.defer_sync, list);
> +       list_add_tail(&dev->links.defer_hook, list);
>  }
>
>  /**
> @@ -776,8 +776,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_sync) {
> -               list_del_init(&dev->links.defer_sync);
> +       list_for_each_entry_safe(dev, tmp, list, links.defer_hook) {
> +               list_del_init(&dev->links.defer_hook);
>
>                 if (dev != dont_lock_dev)
>                         device_lock(dev);
> @@ -815,12 +815,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_sync) {
> +       list_for_each_entry_safe(dev, tmp, &deferred_sync, links.defer_hook) {
>                 /*
>                  * Delete from deferred_sync list before queuing it to
> -                * sync_list because defer_sync is used for both lists.
> +                * sync_list because defer_hook is used for both lists.
>                  */
> -               list_del_init(&dev->links.defer_sync);
> +               list_del_init(&dev->links.defer_hook);
>                 __device_links_queue_sync_state(dev, &sync_list);
>         }
>  out:
> @@ -838,8 +838,8 @@ late_initcall(sync_state_resume_initcall);
>
>  static void __device_links_supplier_defer_sync(struct device *sup)
>  {
> -       if (list_empty(&sup->links.defer_sync) && dev_has_sync_state(sup))
> -               list_add_tail(&sup->links.defer_sync, &deferred_sync);
> +       if (list_empty(&sup->links.defer_hook) && dev_has_sync_state(sup))
> +               list_add_tail(&sup->links.defer_hook, &deferred_sync);
>  }
>
>  static void device_link_drop_managed(struct device_link *link)
> @@ -1052,7 +1052,7 @@ void device_links_driver_cleanup(struct device *dev)
>                 WRITE_ONCE(link->status, DL_STATE_DORMANT);
>         }
>
> -       list_del_init(&dev->links.defer_sync);
> +       list_del_init(&dev->links.defer_hook);
>         __device_links_no_driver(dev);
>
>         device_links_write_unlock();
> @@ -2171,7 +2171,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_sync);
> +       INIT_LIST_HEAD(&dev->links.defer_hook);
>         dev->links.status = DL_DEV_NO_DRIVER;
>  }
>  EXPORT_SYMBOL_GPL(device_initialize);
> diff --git a/include/linux/device.h b/include/linux/device.h
> index 15460a5ac024..9bb2bc7bb8e3 100644
> --- a/include/linux/device.h
> +++ b/include/linux/device.h
> @@ -433,7 +433,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_sync: Hook to global list of devices that have deferred sync_state.
> + * @defer_hook: 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.
> @@ -442,7 +442,7 @@ struct dev_links_info {
>         struct list_head suppliers;
>         struct list_head consumers;
>         struct list_head needs_suppliers;
> -       struct list_head defer_sync;
> +       struct list_head defer_hook;
>         bool need_for_probe;
>         enum dl_dev_state status;
>  };
> --
> 2.27.0.212.ge8ba1cc988-goog
>