Message ID | 95dccc89e638c5cd60a6d13541efd29ca39766fb.1440902901.git.mchehab@osg.samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Hi Javier, Thank you for the patch. On Sunday 30 August 2015 00:06:13 Mauro Carvalho Chehab wrote: > From: Javier Martinez Canillas <javier@osg.samsung.com> > > Assessing media_entity ID should now use media_entity_id() macro to Did you mean "accessing" ? > obtain the entity ID, as a next patch will remove the .id field from > struct media_entity . > > So, get rid of it, otherwise the omap4iss driver will fail to build. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> With the typo fixed, Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > diff --git a/drivers/staging/media/omap4iss/iss.c > b/drivers/staging/media/omap4iss/iss.c index 9bfb725b9986..e54a7afd31de > 100644 > --- a/drivers/staging/media/omap4iss/iss.c > +++ b/drivers/staging/media/omap4iss/iss.c > @@ -607,7 +607,7 @@ static int iss_pipeline_disable(struct iss_pipeline > *pipe, * crashed. Mark it as such, the ISS will be reset when > * applications will release it. > */ > - iss->crashed |= 1U << subdev->entity.id; > + iss->crashed |= 1U << media_entity_id(&subdev->entity); > failure = -ETIMEDOUT; > } > } > diff --git a/drivers/staging/media/omap4iss/iss_video.c > b/drivers/staging/media/omap4iss/iss_video.c index > bae67742706f..25e9e7a6b99d 100644 > --- a/drivers/staging/media/omap4iss/iss_video.c > +++ b/drivers/staging/media/omap4iss/iss_video.c > @@ -784,7 +784,7 @@ iss_video_streamon(struct file *file, void *fh, enum > v4l2_buf_type type) entity = &video->video.entity; > media_entity_graph_walk_start(&graph, entity); > while ((entity = media_entity_graph_walk_next(&graph))) > - pipe->entities |= 1 << entity->id; > + pipe->entities |= 1 << media_entity_id(entity); > > /* Verify that the currently configured format matches the output of > * the connected subdev.
Hello Laurent, On 12/06/2015 12:18 AM, Laurent Pinchart wrote: > Hi Javier, > > Thank you for the patch. > > On Sunday 30 August 2015 00:06:13 Mauro Carvalho Chehab wrote: >> From: Javier Martinez Canillas <javier@osg.samsung.com> >> >> Assessing media_entity ID should now use media_entity_id() macro to > > Did you mean "accessing" ? > Sigh, yet another typo error that seems to be due copy and paste. >> obtain the entity ID, as a next patch will remove the .id field from >> struct media_entity . >> >> So, get rid of it, otherwise the omap4iss driver will fail to build. >> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> >> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> >> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> > > With the typo fixed, > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Thanks. Best regards,
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index 9bfb725b9986..e54a7afd31de 100644 --- a/drivers/staging/media/omap4iss/iss.c +++ b/drivers/staging/media/omap4iss/iss.c @@ -607,7 +607,7 @@ static int iss_pipeline_disable(struct iss_pipeline *pipe, * crashed. Mark it as such, the ISS will be reset when * applications will release it. */ - iss->crashed |= 1U << subdev->entity.id; + iss->crashed |= 1U << media_entity_id(&subdev->entity); failure = -ETIMEDOUT; } } diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index bae67742706f..25e9e7a6b99d 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -784,7 +784,7 @@ iss_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) entity = &video->video.entity; media_entity_graph_walk_start(&graph, entity); while ((entity = media_entity_graph_walk_next(&graph))) - pipe->entities |= 1 << entity->id; + pipe->entities |= 1 << media_entity_id(entity); /* Verify that the currently configured format matches the output of * the connected subdev.