| Message ID | 1439998526-12832-2-git-send-email-javier@osg.samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Javier, Thank you for the patch. On Wednesday 19 August 2015 17:35:19 Javier Martinez Canillas wrote: > The struct media_entity does not have an .id field anymore since > now the entity ID is stored in the embedded struct media_gobj. > > This caused the omap4iss driver fail to build. Fix by using the > media_entity_id() macro to obtain the entity ID. > > Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> This looks fine to me. The patch needs to be moved between Mauro's 1/8 and 2/8 patches to avoid breaking bisection with patch 3/8. I'd squash this patch and 2/4 into a single "media: Use media_entity_id() in drivers" patch. > --- > > drivers/staging/media/omap4iss/iss.c | 2 +- > drivers/staging/media/omap4iss/iss_video.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/omap4iss/iss.c > b/drivers/staging/media/omap4iss/iss.c index f32ab7b98ae2..7226553ceb2f > 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 08/20/2015 08:37 PM, Laurent Pinchart wrote: > Hi Javier, > > Thank you for the patch. > > On Wednesday 19 August 2015 17:35:19 Javier Martinez Canillas wrote: >> The struct media_entity does not have an .id field anymore since >> now the entity ID is stored in the embedded struct media_gobj. >> >> This caused the omap4iss driver fail to build. Fix by using the >> media_entity_id() macro to obtain the entity ID. >> >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > > This looks fine to me. The patch needs to be moved between Mauro's 1/8 and 2/8 > patches to avoid breaking bisection with patch 3/8. I'd squash this patch and > 2/4 into a single "media: Use media_entity_id() in drivers" patch. > Yes, Hans and Mauro already mentioned it and I completely agree that should be squashed with Mauro's patch to maintain git bisect-ability. Best regards,
Hi Javier, On Friday 21 August 2015 02:14:05 Javier Martinez Canillas wrote: > On 08/20/2015 08:37 PM, Laurent Pinchart wrote: > > On Wednesday 19 August 2015 17:35:19 Javier Martinez Canillas wrote: > >> The struct media_entity does not have an .id field anymore since > >> now the entity ID is stored in the embedded struct media_gobj. > >> > >> This caused the omap4iss driver fail to build. Fix by using the > >> media_entity_id() macro to obtain the entity ID. > >> > >> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> > > > > This looks fine to me. The patch needs to be moved between Mauro's 1/8 and > > 2/8 patches to avoid breaking bisection with patch 3/8. I'd squash this > > patch and 2/4 into a single "media: Use media_entity_id() in drivers" > > patch. > > Yes, Hans and Mauro already mentioned it and I completely agree that > should be squashed with Mauro's patch to maintain git bisect-ability. I wouldn't squash patches 1/4 and 2/4 into Mauro's 3/8 patch as Hans proposed, but instead squashing them together into a single patch and move the result as 1.5/8 in Mauro's series.
Hello Laurent, On 08/21/2015 02:15 AM, Laurent Pinchart wrote: > Hi Javier, > > On Friday 21 August 2015 02:14:05 Javier Martinez Canillas wrote: >> On 08/20/2015 08:37 PM, Laurent Pinchart wrote: >>> On Wednesday 19 August 2015 17:35:19 Javier Martinez Canillas wrote: >>>> The struct media_entity does not have an .id field anymore since >>>> now the entity ID is stored in the embedded struct media_gobj. >>>> >>>> This caused the omap4iss driver fail to build. Fix by using the >>>> media_entity_id() macro to obtain the entity ID. >>>> >>>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> >>> >>> This looks fine to me. The patch needs to be moved between Mauro's 1/8 and >>> 2/8 patches to avoid breaking bisection with patch 3/8. I'd squash this >>> patch and 2/4 into a single "media: Use media_entity_id() in drivers" >>> patch. >> >> Yes, Hans and Mauro already mentioned it and I completely agree that >> should be squashed with Mauro's patch to maintain git bisect-ability. > > I wouldn't squash patches 1/4 and 2/4 into Mauro's 3/8 patch as Hans proposed, > but instead squashing them together into a single patch and move the result as > 1.5/8 in Mauro's series. > I see. I don't mind either option tbh, I'm OK with whatever works better. Best regards,
On 08/21/2015 02:15 AM, Laurent Pinchart wrote: > Hi Javier, > > On Friday 21 August 2015 02:14:05 Javier Martinez Canillas wrote: >> On 08/20/2015 08:37 PM, Laurent Pinchart wrote: >>> On Wednesday 19 August 2015 17:35:19 Javier Martinez Canillas wrote: >>>> The struct media_entity does not have an .id field anymore since >>>> now the entity ID is stored in the embedded struct media_gobj. >>>> >>>> This caused the omap4iss driver fail to build. Fix by using the >>>> media_entity_id() macro to obtain the entity ID. >>>> >>>> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> >>> >>> This looks fine to me. The patch needs to be moved between Mauro's 1/8 and >>> 2/8 patches to avoid breaking bisection with patch 3/8. I'd squash this >>> patch and 2/4 into a single "media: Use media_entity_id() in drivers" >>> patch. >> >> Yes, Hans and Mauro already mentioned it and I completely agree that >> should be squashed with Mauro's patch to maintain git bisect-ability. > > I wouldn't squash patches 1/4 and 2/4 into Mauro's 3/8 patch as Hans proposed, > but instead squashing them together into a single patch and move the result as > 1.5/8 in Mauro's series. > I agree with Laurent, this is a better solution. Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c index f32ab7b98ae2..7226553ceb2f 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.
The struct media_entity does not have an .id field anymore since now the entity ID is stored in the embedded struct media_gobj. This caused the omap4iss driver fail to build. Fix by using the media_entity_id() macro to obtain the entity ID. Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> --- drivers/staging/media/omap4iss/iss.c | 2 +- drivers/staging/media/omap4iss/iss_video.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)