From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:56383 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193AbbLFDUH (ORCPT ); Sat, 5 Dec 2015 22:20:07 -0500 From: Laurent Pinchart To: Mauro Carvalho Chehab Cc: Linux Media Mailing List , Mauro Carvalho Chehab , linux-sh@vger.kernel.org Subject: Re: [PATCH v8 01/55] [media] media: create a macro to get entity ID Date: Sun, 06 Dec 2015 05:20:20 +0200 Message-ID: <2446178.XgL7rIoWQj@avalon> In-Reply-To: <6185117c4ad70fd3e1c780689e0ad2407fdf1294.1440902901.git.mchehab@osg.samsung.com> References: <6185117c4ad70fd3e1c780689e0ad2407fdf1294.1440902901.git.mchehab@osg.samsung.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: Hi Mauro, Thank you for the patch. On Sunday 30 August 2015 00:06:12 Mauro Carvalho Chehab wrote: > Instead of accessing directly entity.id, let's create a macro, > as this field will be moved into a common struct later on. > > Signed-off-by: Mauro Carvalho Chehab > Acked-by: Hans Verkuil Acked-by: Laurent Pinchart > diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c > index c55ab5029323..e429605ca2c3 100644 > --- a/drivers/media/media-device.c > +++ b/drivers/media/media-device.c > @@ -77,8 +77,8 @@ static struct media_entity *find_entity(struct > media_device *mdev, u32 id) spin_lock(&mdev->lock); > > media_device_for_each_entity(entity, mdev) { > - if ((entity->id == id && !next) || > - (entity->id > id && next)) { > + if (((media_entity_id(entity) == id) && !next) || > + ((media_entity_id(entity) > id) && next)) { > spin_unlock(&mdev->lock); > return entity; > } > @@ -104,7 +104,7 @@ static long media_device_enum_entities(struct > media_device *mdev, if (ent == NULL) > return -EINVAL; > > - u_ent.id = ent->id; > + u_ent.id = media_entity_id(ent); > if (ent->name) > strlcpy(u_ent.name, ent->name, sizeof(u_ent.name)); > u_ent.type = ent->type; > @@ -122,7 +122,7 @@ static long media_device_enum_entities(struct > media_device *mdev, static void media_device_kpad_to_upad(const struct > media_pad *kpad, struct media_pad_desc *upad) > { > - upad->entity = kpad->entity->id; > + upad->entity = media_entity_id(kpad->entity); > upad->index = kpad->index; > upad->flags = kpad->flags; > } > diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c > index 949e5f92cbdc..cb0ac4e0dfa5 100644 > --- a/drivers/media/media-entity.c > +++ b/drivers/media/media-entity.c > @@ -140,10 +140,10 @@ void media_entity_graph_walk_start(struct > media_entity_graph *graph, graph->stack[graph->top].entity = NULL; > bitmap_zero(graph->entities, MEDIA_ENTITY_ENUM_MAX_ID); > > - if (WARN_ON(entity->id >= MEDIA_ENTITY_ENUM_MAX_ID)) > + if (WARN_ON(media_entity_id(entity) >= MEDIA_ENTITY_ENUM_MAX_ID)) > return; > > - __set_bit(entity->id, graph->entities); > + __set_bit(media_entity_id(entity), graph->entities); > stack_push(graph, entity); > } > EXPORT_SYMBOL_GPL(media_entity_graph_walk_start); > @@ -184,11 +184,11 @@ media_entity_graph_walk_next(struct media_entity_graph > *graph) > > /* Get the entity in the other end of the link . */ > next = media_entity_other(entity, link); > - if (WARN_ON(next->id >= MEDIA_ENTITY_ENUM_MAX_ID)) > + if (WARN_ON(media_entity_id(next) >= MEDIA_ENTITY_ENUM_MAX_ID)) > return NULL; > > /* Has the entity already been visited? */ > - if (__test_and_set_bit(next->id, graph->entities)) { > + if (__test_and_set_bit(media_entity_id(next), graph->entities)) { > link_top(graph)++; > continue; > } > diff --git a/drivers/media/platform/vsp1/vsp1_video.c > b/drivers/media/platform/vsp1/vsp1_video.c index 17f08973f835..debe4e539df6 > 100644 > --- a/drivers/media/platform/vsp1/vsp1_video.c > +++ b/drivers/media/platform/vsp1/vsp1_video.c > @@ -352,10 +352,10 @@ static int vsp1_pipeline_validate_branch(struct > vsp1_pipeline *pipe, break; > > /* Ensure the branch has no loop. */ > - if (entities & (1 << entity->subdev.entity.id)) > + if (entities & (1 << media_entity_id(&entity->subdev.entity))) > return -EPIPE; > > - entities |= 1 << entity->subdev.entity.id; > + entities |= 1 << media_entity_id(&entity->subdev.entity); > > /* UDS can't be chained. */ > if (entity->type == VSP1_ENTITY_UDS) { > diff --git a/include/media/media-entity.h b/include/media/media-entity.h > index 8b21a4d920d9..0a66fc225559 100644 > --- a/include/media/media-entity.h > +++ b/include/media/media-entity.h > @@ -113,6 +113,11 @@ static inline u32 media_entity_subtype(struct > media_entity *entity) return entity->type & MEDIA_ENT_SUBTYPE_MASK; > } > > +static inline u32 media_entity_id(struct media_entity *entity) > +{ > + return entity->id; > +} > + > #define MEDIA_ENTITY_ENUM_MAX_DEPTH 16 > #define MEDIA_ENTITY_ENUM_MAX_ID 64 -- Regards, Laurent Pinchart