Commit b6d42c35 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

media: v4l: async: Clean up list heads and entries 



The naming of list heads and list entries is confusing as they're named
similarly. Use _list for list head and _entry for list entries.

Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de> # imx6qp
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> # rcar + adv746x
Tested-by: Aishwarya Kothari <aishwarya.kothari@toradex.com> # Apalis i.MX6Q with TC358743
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> # Renesas RZ/G2L SMARC
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 9b4d2f37

drivers/media/pci/intel/ipu3/ipu3-cio2.c

+1 −1
Original line number Diff line number Diff line
@@ -1421,7 +1421,7 @@ static int cio2_notifier_complete(struct v4l2_async_notifier *notifier) 
	struct cio2_queue *q;

	int ret;



	list_for_each_entry(asd, &cio2->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &cio2->notifier.asd_list, asd_entry) {

		s_asd = to_sensor_asd(asd);

		q = &cio2->queue[s_asd->csi2.port];

drivers/media/platform/xilinx/xilinx-vipp.c

+3 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ xvip_graph_find_entity(struct xvip_composite_device *xdev, 
	struct xvip_graph_entity *entity;

	struct v4l2_async_subdev *asd;



	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_entry) {

		entity = to_xvip_entity(asd);

		if (entity->asd.match.fwnode == fwnode)

			return entity;
@@ -291,7 +291,7 @@ static int xvip_graph_notify_complete(struct v4l2_async_notifier *notifier) 
	dev_dbg(xdev->dev, "notify complete, all subdevs registered\n");



	/* Create links for every entity. */

	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_entry) {

		entity = to_xvip_entity(asd);

		ret = xvip_graph_build_one(xdev, entity);

		if (ret < 0)
@@ -393,7 +393,7 @@ static int xvip_graph_parse(struct xvip_composite_device *xdev) 
	if (ret < 0)

		return 0;



	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &xdev->notifier.asd_list, asd_entry) {

		entity = to_xvip_entity(asd);

		ret = xvip_graph_parse_one(xdev, entity->asd.match.fwnode);

		if (ret < 0) {

drivers/media/v4l2-core/v4l2-async.c

+27 −27
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ v4l2_async_find_match(struct v4l2_async_notifier *notifier, 
		      struct v4l2_async_match_desc *match);

	struct v4l2_async_subdev *asd;



	list_for_each_entry(asd, &notifier->waiting, list) {

	list_for_each_entry(asd, &notifier->waiting_list, waiting_entry) {

		/* bus_type has been verified valid before */

		switch (asd->match.type) {

		case V4L2_ASYNC_MATCH_TYPE_I2C:
@@ -262,7 +262,7 @@ v4l2_async_find_subdev_notifier(struct v4l2_subdev *sd) 
{

	struct v4l2_async_notifier *n;



	list_for_each_entry(n, &notifier_list, list)

	list_for_each_entry(n, &notifier_list, notifier_entry)

		if (n->sd == sd)

			return n;
@@ -287,10 +287,10 @@ v4l2_async_nf_can_complete(struct v4l2_async_notifier *notifier) 
{

	struct v4l2_subdev *sd;



	if (!list_empty(&notifier->waiting))

	if (!list_empty(&notifier->waiting_list))

		return false;



	list_for_each_entry(sd, &notifier->done, async_list) {

	list_for_each_entry(sd, &notifier->done_list, async_list) {

		struct v4l2_async_notifier *subdev_notifier =

			v4l2_async_find_subdev_notifier(sd);
@@ -312,7 +312,7 @@ v4l2_async_nf_try_complete(struct v4l2_async_notifier *notifier) 
	struct v4l2_async_notifier *__notifier = notifier;



	/* Quick check whether there are still more sub-devices here. */

	if (!list_empty(&notifier->waiting))

	if (!list_empty(&notifier->waiting_list))

		return 0;



	if (notifier->sd)
@@ -391,13 +391,12 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier, 
		return ret;

	}



	/* Remove from the waiting list */

	list_del(&asd->list);

	list_del(&asd->waiting_entry);

	sd->asd = asd;

	sd->notifier = notifier;



	/* Move from the global subdevice list to notifier's done */

	list_move(&sd->async_list, &notifier->done);

	list_move(&sd->async_list, &notifier->done_list);



	dev_dbg(notifier_dev(notifier), "v4l2-async: %s bound (ret %d)\n",

		dev_name(sd->dev), ret);
@@ -478,7 +477,7 @@ v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier, 
{

	struct v4l2_subdev *sd, *tmp;



	list_for_each_entry_safe(sd, tmp, &notifier->done, async_list) {

	list_for_each_entry_safe(sd, tmp, &notifier->done_list, async_list) {

		struct v4l2_async_notifier *subdev_notifier =

			v4l2_async_find_subdev_notifier(sd);
@@ -487,7 +486,8 @@ v4l2_async_nf_unbind_all_subdevs(struct v4l2_async_notifier *notifier, 


		v4l2_async_nf_call_unbind(notifier, sd, sd->asd);

		if (readd)

			list_add_tail(&sd->asd->list, &notifier->waiting);

			list_add_tail(&sd->asd->waiting_entry,

				      &notifier->waiting_list);

		v4l2_async_cleanup(sd);



		list_move(&sd->async_list, &subdev_list);
@@ -504,11 +504,11 @@ v4l2_async_nf_has_async_match_entry(struct v4l2_async_notifier *notifier, 
	struct v4l2_async_subdev *asd;

	struct v4l2_subdev *sd;



	list_for_each_entry(asd, &notifier->waiting, list)

	list_for_each_entry(asd, &notifier->waiting_list, waiting_entry)

		if (v4l2_async_match_equal(&asd->match, match))

			return true;



	list_for_each_entry(sd, &notifier->done, async_list) {

	list_for_each_entry(sd, &notifier->done_list, async_list) {

		if (WARN_ON(!sd->asd))

			continue;
@@ -535,7 +535,7 @@ v4l2_async_nf_has_async_match(struct v4l2_async_notifier *notifier, 
	lockdep_assert_held(&list_lock);



	/* Check that an asd is not being added more than once. */

	list_for_each_entry(asd, &notifier->asd_list, asd_list) {

	list_for_each_entry(asd, &notifier->asd_list, asd_entry) {

		if (skip_self && &asd->match == match)

			continue;

		if (v4l2_async_match_equal(&asd->match, match))
@@ -543,7 +543,7 @@ v4l2_async_nf_has_async_match(struct v4l2_async_notifier *notifier, 
	}



	/* Check that an asd does not exist in other notifiers. */

	list_for_each_entry(notifier, &notifier_list, list)

	list_for_each_entry(notifier, &notifier_list, notifier_entry)

		if (v4l2_async_nf_has_async_match_entry(notifier, match))

			return true;
@@ -585,17 +585,17 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier) 
	struct v4l2_async_subdev *asd;

	int ret;



	INIT_LIST_HEAD(&notifier->waiting);

	INIT_LIST_HEAD(&notifier->done);

	INIT_LIST_HEAD(&notifier->waiting_list);

	INIT_LIST_HEAD(&notifier->done_list);



	mutex_lock(&list_lock);



	list_for_each_entry(asd, &notifier->asd_list, asd_list) {

	list_for_each_entry(asd, &notifier->asd_list, asd_entry) {

		ret = v4l2_async_nf_match_valid(notifier, &asd->match, true);

		if (ret)

			goto err_unlock;



		list_add_tail(&asd->list, &notifier->waiting);

		list_add_tail(&asd->waiting_entry, &notifier->waiting_list);

	}



	ret = v4l2_async_nf_try_all_subdevs(notifier);
@@ -607,7 +607,7 @@ static int __v4l2_async_nf_register(struct v4l2_async_notifier *notifier) 
		goto err_unbind;



	/* Keep also completed notifiers on the list */

	list_add(&notifier->list, &notifier_list);

	list_add(&notifier->notifier_entry, &notifier_list);



	mutex_unlock(&list_lock);
@@ -672,7 +672,7 @@ __v4l2_async_nf_unregister(struct v4l2_async_notifier *notifier) 
	notifier->sd = NULL;

	notifier->v4l2_dev = NULL;



	list_del(&notifier->list);

	list_del(&notifier->notifier_entry);

}



void v4l2_async_nf_unregister(struct v4l2_async_notifier *notifier)
@@ -692,7 +692,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier) 
	if (!notifier || !notifier->asd_list.next)

		return;



	list_for_each_entry_safe(asd, tmp, &notifier->asd_list, asd_list) {

	list_for_each_entry_safe(asd, tmp, &notifier->asd_list, asd_entry) {

		switch (asd->match.type) {

		case V4L2_ASYNC_MATCH_TYPE_FWNODE:

			fwnode_handle_put(asd->match.fwnode);
@@ -701,7 +701,7 @@ static void __v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier) 
			break;

		}



		list_del(&asd->asd_list);

		list_del(&asd->asd_entry);

		v4l2_async_nf_call_destroy(notifier, asd);

		kfree(asd);

	}
@@ -729,7 +729,7 @@ static int __v4l2_async_nf_add_subdev(struct v4l2_async_notifier *notifier, 
	if (ret)

		goto unlock;



	list_add_tail(&asd->asd_list, &notifier->asd_list);

	list_add_tail(&asd->asd_entry, &notifier->asd_list);



unlock:

	mutex_unlock(&list_lock);
@@ -827,7 +827,7 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd) 


	INIT_LIST_HEAD(&sd->async_list);



	list_for_each_entry(notifier, &notifier_list, list) {

	list_for_each_entry(notifier, &notifier_list, notifier_entry) {

		struct v4l2_device *v4l2_dev =

			v4l2_async_nf_find_v4l2_dev(notifier);

		struct v4l2_async_subdev *asd;
@@ -894,7 +894,7 @@ void v4l2_async_unregister_subdev(struct v4l2_subdev *sd) 
	if (sd->asd) {

		struct v4l2_async_notifier *notifier = sd->notifier;



		list_add(&sd->asd->list, &notifier->waiting);

		list_add(&sd->asd->waiting_entry, &notifier->waiting_list);



		v4l2_async_nf_call_unbind(notifier, sd, sd->asd);

	}
@@ -948,9 +948,9 @@ static int pending_subdevs_show(struct seq_file *s, void *data) 


	mutex_lock(&list_lock);



	list_for_each_entry(notif, &notifier_list, list) {

	list_for_each_entry(notif, &notifier_list, notifier_entry) {

		seq_printf(s, "%s:\n", v4l2_async_nf_name(notif));

		list_for_each_entry(asd, &notif->waiting, list)

		list_for_each_entry(asd, &notif->waiting_list, waiting_entry)

			print_waiting_match(s, &asd->match);

	}

drivers/staging/media/tegra-video/vi.c

+2 −2
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ tegra_vi_graph_find_entity(struct tegra_vi_channel *chan, 
	struct tegra_vi_graph_entity *entity;

	struct v4l2_async_subdev *asd;



	list_for_each_entry(asd, &chan->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &chan->notifier.asd_list, asd_entry) {

		entity = to_tegra_vi_graph_entity(asd);

		if (entity->asd.match.fwnode == fwnode)

			return entity;
@@ -1608,7 +1608,7 @@ static int tegra_vi_graph_notify_complete(struct v4l2_async_notifier *notifier) 
	}



	/* create links between the entities */

	list_for_each_entry(asd, &chan->notifier.asd_list, asd_list) {

	list_for_each_entry(asd, &chan->notifier.asd_list, asd_entry) {

		entity = to_tegra_vi_graph_entity(asd);

		ret = tegra_vi_graph_build(chan, entity);

		if (ret < 0)

include/media/v4l2-async.h

+11 −11
Original line number Diff line number Diff line
@@ -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

 * @asd_entry:	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

 * @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;

};



/**