From: Jacopo Mondi <jacopo+renesas@jmondi.org>
To: sakari.ailus@linux.intel.com, laurent.pinchart@ideasonboard.com,
niklas.soderlund+renesas@ragnatech.se
Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>,
luca@lucaceresoli.net, ian.arkver.dev@gmail.com,
linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org
Subject: [PATCH v4 05/31] media: entity: Add iterator helper for entity pads
Date: Thu, 28 Mar 2019 21:05:42 +0100 [thread overview]
Message-ID: <20190328200608.9463-6-jacopo+renesas@jmondi.org> (raw)
In-Reply-To: <20190328200608.9463-1-jacopo+renesas@jmondi.org>
Add an iterator helper to easily cycle through all pads in an entity and
use it in media-entity and media-device code where appropriate.
Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
drivers/media/media-device.c | 13 ++++++-------
drivers/media/media-entity.c | 11 ++++++-----
include/media/media-entity.h | 12 ++++++++++++
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index b8ec88612df7..cddf5a0857b9 100644
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -584,7 +584,7 @@ int __must_check media_device_register_entity(struct media_device *mdev,
struct media_entity *entity)
{
struct media_entity_notify *notify, *next;
- unsigned int i;
+ struct media_pad *iter;
int ret;
if (entity->function == MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN ||
@@ -613,9 +613,8 @@ int __must_check media_device_register_entity(struct media_device *mdev,
media_gobj_create(mdev, MEDIA_GRAPH_ENTITY, &entity->graph_obj);
/* Initialize objects at the pads */
- for (i = 0; i < entity->num_pads; i++)
- media_gobj_create(mdev, MEDIA_GRAPH_PAD,
- &entity->pads[i].graph_obj);
+ media_entity_for_each_pad(entity, iter)
+ media_gobj_create(mdev, MEDIA_GRAPH_PAD, &iter->graph_obj);
/* invoke entity_notify callbacks */
list_for_each_entry_safe(notify, next, &mdev->entity_notify, list)
@@ -649,7 +648,7 @@ static void __media_device_unregister_entity(struct media_entity *entity)
struct media_device *mdev = entity->graph_obj.mdev;
struct media_link *link, *tmp;
struct media_interface *intf;
- unsigned int i;
+ struct media_pad *iter;
ida_free(&mdev->entity_internal_idx, entity->internal_idx);
@@ -665,8 +664,8 @@ static void __media_device_unregister_entity(struct media_entity *entity)
__media_entity_remove_links(entity);
/* Remove all pads that belong to this entity */
- for (i = 0; i < entity->num_pads; i++)
- media_gobj_destroy(&entity->pads[i].graph_obj);
+ media_entity_for_each_pad(entity, iter)
+ media_gobj_destroy(&iter->graph_obj);
/* Remove the entity */
media_gobj_destroy(&entity->graph_obj);
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index e4b28845f330..b092cbf25ebb 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -206,7 +206,8 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
struct media_pad *pads)
{
struct media_device *mdev = entity->graph_obj.mdev;
- unsigned int i;
+ struct media_pad *iter;
+ unsigned int i = 0;
if (num_pads >= MEDIA_ENTITY_MAX_PADS)
return -E2BIG;
@@ -217,12 +218,12 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
if (mdev)
mutex_lock(&mdev->graph_mutex);
- for (i = 0; i < num_pads; i++) {
- pads[i].entity = entity;
- pads[i].index = i;
+ media_entity_for_each_pad(entity, iter) {
+ iter->entity = entity;
+ iter->index = i++;
if (mdev)
media_gobj_create(mdev, MEDIA_GRAPH_PAD,
- &entity->pads[i].graph_obj);
+ &iter->graph_obj);
}
if (mdev)
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index bb44f865c9d0..76785a6151de 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -1109,3 +1109,15 @@ void media_remove_intf_links(struct media_interface *intf);
(entity)->ops->operation((entity) , ##args) : -ENOIOCTLCMD)
#endif
+
+/**
+ * media_entity_for_each_pad - Iterate on all pads in an entity
+ * @entity: The entity the pads belong to
+ * @iter: The iterator pad
+ *
+ * Iterate on all pads in a media entity.
+ */
+#define media_entity_for_each_pad(entity, iter) \
+ for (iter = (entity)->pads; \
+ iter < &(entity)->pads[(entity)->num_pads]; \
+ ++iter)
--
2.21.0
next prev parent reply other threads:[~2019-03-28 20:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-28 20:05 [PATCH v4 00/31] v4l: add support for multiplexed streams Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 01/31] media: entity: Use pad as a starting point for graph walk Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 02/31] media: entity: Use pads instead of entities in the media graph walk stack Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 03/31] media: entity: Walk the graph based on pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 04/31] v4l: mc: Start walk from a specific pad in use count calculation Jacopo Mondi
2019-03-28 20:05 ` Jacopo Mondi [this message]
2019-03-28 20:05 ` [PATCH v4 06/31] media: entity: Move the pipeline from entity to pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 07/31] media: entity: Use pad as the starting point for a pipeline Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 08/31] media: entity: Add has_route entity operation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 09/31] media: entity: Add media_entity_has_route() function Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 10/31] media: entity: Use routing information during graph traversal Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 11/31] media: entity: Skip link validation for pads to which there is no route to Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 12/31] media: entity: Add an iterator helper for connected pads Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 13/31] media: entity: Add only connected pads to the pipeline Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 14/31] media: entity: Add debug information in graph walk route check Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 15/31] v4l: Add bus type to frame descriptors Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 16/31] v4l: Add CSI-2 bus configuration " Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 17/31] v4l: Add stream to frame descriptor Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 18/31] v4l: subdev: Add [GS]_ROUTING subdev ioctls and operations Jacopo Mondi
2019-04-01 12:35 ` Sakari Ailus
2019-03-28 20:05 ` [PATCH v4 19/31] media: Documentation: Add GS_ROUTING documentation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 20/31] v4l: subdev: Take routing information into account in link validation Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 21/31] v4l: subdev: Improve link format validation debug messages Jacopo Mondi
2019-03-28 20:05 ` [PATCH v4 22/31] v4l: mc: Add an S_ROUTING helper function for power state changes Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 23/31] adv748x: csi2: add translation from pixelcode to CSI-2 datatype Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 24/31] adv748x: csi2: only allow formats on sink pads Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 25/31] adv748x: csi2: describe the multiplexed stream Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 26/31] adv748x: csi2: add internal routing configuration Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 27/31] adv748x: afe: add routing support Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 28/31] adv748x: afe: Implement has_route() Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 29/31] rcar-csi2: use frame description information to configure CSI-2 bus Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 30/31] rcar-csi2: expose the subdevice internal routing Jacopo Mondi
2019-03-28 20:06 ` [PATCH v4 31/31] media: rcar-csi2: Implement has_route() Jacopo Mondi
2019-03-29 1:17 ` [PATCH v4 00/31] v4l: add support for multiplexed streams Sakari Ailus
2019-03-29 8:32 ` Jacopo Mondi
2019-04-01 12:32 ` Sakari Ailus
2021-02-11 13:44 ` Tomi Valkeinen
2022-10-06 11:20 ` Sakari Ailus
2022-10-07 11:58 ` Tomi Valkeinen
2022-10-07 12:14 ` Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190328200608.9463-6-jacopo+renesas@jmondi.org \
--to=jacopo+renesas@jmondi.org \
--cc=ian.arkver.dev@gmail.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=luca@lucaceresoli.net \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=sakari.ailus@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).