Hi Laurent, On Tue, May 30, 2023 at 06:09:29AM +0300, Laurent Pinchart wrote: > > diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h > > index 8d1506a9755c3..54f9f45ed3d8e 100644 > > --- a/include/media/v4l2-async.h > > +++ b/include/media/v4l2-async.h > > @@ -65,10 +65,10 @@ struct v4l2_async_match_desc { > > * struct v4l2_async_subdev - sub-device descriptor, as known to a bridge > > * > > * @match: struct of match type and per-bus type matching data sets > > - * @asd_list: used to add struct v4l2_async_subdev objects to the > > - * master notifier @asd_list > > - * @list: used to link struct v4l2_async_subdev objects, waiting to be > > - * probed, to a notifier->waiting list > > + * @asd_entry: used to add struct v4l2_async_subdev objects to the > > + * master notifier @asd_entry > > I think you mean 'master notifier @asd_list' here. Yes, thank you. > > > + * @waiting_entry: used to link struct v4l2_async_subdev objects, waiting to be > > + * probed, to a notifier->waiting_list list > > * > > * When this struct is used as a member in a driver specific struct, > > * the driver specific struct shall contain the &struct > > @@ -76,8 +76,8 @@ struct v4l2_async_match_desc { > > */ > > struct v4l2_async_subdev { > > struct v4l2_async_match_desc match; > > - struct list_head list; > > - struct list_head asd_list; > > + struct list_head asd_entry; > > + struct list_head waiting_entry; > > }; > > > > /** > > @@ -107,9 +107,9 @@ struct v4l2_async_notifier_operations { > > * @sd: sub-device that registered the notifier, NULL otherwise > > * @parent: parent notifier > > * @asd_list: master list of struct v4l2_async_subdev > > - * @waiting: list of struct v4l2_async_subdev, waiting for their drivers > > - * @done: list of struct v4l2_subdev, already probed > > - * @list: member in a global list of notifiers > > + * @waiting_list: list of struct v4l2_async_subdev, waiting for their drivers > > + * @done_list: list of struct v4l2_subdev, already probed > > + * @notifier_entry: member in a global list of notifiers > > */ > > struct v4l2_async_notifier { > > const struct v4l2_async_notifier_operations *ops; > > @@ -117,9 +117,9 @@ struct v4l2_async_notifier { > > struct v4l2_subdev *sd; > > struct v4l2_async_notifier *parent; > > struct list_head asd_list; > > - struct list_head waiting; > > - struct list_head done; > > - struct list_head list; > > + struct list_head waiting_list; > > + struct list_head done_list; > > + struct list_head notifier_entry; > > }; > > > > /** > > @@ -134,7 +134,7 @@ void v4l2_async_debug_init(struct dentry *debugfs_dir); > > * > > * @notifier: pointer to &struct v4l2_async_notifier > > * > > - * This function initializes the notifier @asd_list. It must be called > > + * This function initializes the notifier @asd_entry. It must be called > > * before adding a subdevice to a notifier, using one of: > > * v4l2_async_nf_add_fwnode_remote(), v4l2_async_nf_add_fwnode() or > > * v4l2_async_nf_add_i2c(). > > @@ -147,7 +147,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier, > > unsigned int asd_struct_size); > > /** > > * v4l2_async_nf_add_fwnode - Allocate and add a fwnode async > > - * subdev to the notifier's master asd_list. > > + * subdev to the notifier's master asd_entry. > > * > > * @notifier: pointer to &struct v4l2_async_notifier > > * @fwnode: fwnode handle of the sub-device to be matched, pointer to > > @@ -157,7 +157,7 @@ __v4l2_async_nf_add_fwnode(struct v4l2_async_notifier *notifier, > > * sub-device struct, i.e. both begin at the same memory address. > > * > > * Allocate a fwnode-matched asd of size asd_struct_size, and add it to the > > - * notifiers @asd_list. The function also gets a reference of the fwnode which > > + * notifiers @asd_entry. The function also gets a reference of the fwnode which > > * is released later at notifier cleanup time. > > */ > > #define v4l2_async_nf_add_fwnode(notifier, fwnode, type) \ > > @@ -170,7 +170,7 @@ __v4l2_async_nf_add_fwnode_remote(struct v4l2_async_notifier *notif, > > /** > > * v4l2_async_nf_add_fwnode_remote - Allocate and add a fwnode > > * remote async subdev to the > > - * notifier's master asd_list. > > + * notifier's master asd_entry. > > * > > * @notifier: pointer to &struct v4l2_async_notifier > > * @ep: local endpoint pointing to the remote sub-device to be matched, > > @@ -180,7 +180,7 @@ __v4l2_async_nf_add_fwnode_remote(struct v4l2_async_notifier *notif, > > * sub-device struct, i.e. both begin at the same memory address. > > * > > * Gets the remote endpoint of a given local endpoint, set it up for fwnode > > - * matching and adds the async sub-device to the notifier's @asd_list. The > > + * matching and adds the async sub-device to the notifier's @asd_entry. The > > * function also gets a reference of the fwnode which is released later at > > * notifier cleanup time. > > * > > @@ -196,7 +196,7 @@ __v4l2_async_nf_add_i2c(struct v4l2_async_notifier *notifier, > > unsigned int asd_struct_size); > > /** > > * v4l2_async_nf_add_i2c - Allocate and add an i2c async > > - * subdev to the notifier's master asd_list. > > + * subdev to the notifier's master asd_entry. > > * > > * @notifier: pointer to &struct v4l2_async_notifier > > * @adapter: I2C adapter ID to be matched > > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h > > index cfd19e72d0fc4..82e4cf3dd2e05 100644 > > --- a/include/media/v4l2-subdev.h > > +++ b/include/media/v4l2-subdev.h > > @@ -1020,7 +1020,7 @@ struct v4l2_subdev_platform_data { > > * @dev: pointer to the physical device, if any > > * @fwnode: The fwnode_handle of the subdev, usually the same as > > * either dev->of_node->fwnode or dev->fwnode (whichever is non-NULL). > > - * @async_list: Links this subdev to a global subdev_list or @notifier->done > > + * @async_list: Links this subdev to a global subdev_entry or @notifier->done > > There's no subdev_entry, and the list is now called notifier->done_list. > Have you renamed the wrong thing ? Oops. I'll fix this for v4. -- Sakari Ailus