On 08/23/2015 10:17 PM, Mauro Carvalho Chehab wrote:
> From: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
>
> X-Patchwork-Delegate: laurent.pinchart@xxxxxxxxxxxxxxxx
> 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 omap3isp driver fail to build. Fix by using the
> media_entity_id() macro to obtain the entity ID.
Same issue with the commit log as in the previous patch.
After fixing you can add my:
Acked-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
Regards,
Hans
>
> Signed-off-by: Javier Martinez Canillas <javier@xxxxxxxxxxxxxxx>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
>
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index 56e683b19a73..e08183f9d0f7 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -975,6 +975,7 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
> struct v4l2_subdev *subdev;
> int failure = 0;
> int ret;
> + u32 id;
>
> /*
> * We need to stop all the modules after CCDC first or they'll
> @@ -1027,8 +1028,10 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
> if (ret) {
> dev_info(isp->dev, "Unable to stop %s\n", subdev->name);
> isp->stop_failure = true;
> - if (subdev == &isp->isp_prev.subdev)
> - isp->crashed |= 1U << subdev->entity.id;
> + if (subdev == &isp->isp_prev.subdev) {
> + id = media_entity_id(&subdev->entity);
> + isp->crashed |= 1U << id;
> + }
> failure = -ETIMEDOUT;
> }
> }
> diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
> index 3b10304b580b..d96e3be5e252 100644
> --- a/drivers/media/platform/omap3isp/ispccdc.c
> +++ b/drivers/media/platform/omap3isp/ispccdc.c
> @@ -1608,7 +1608,7 @@ static int ccdc_isr_buffer(struct isp_ccdc_device *ccdc)
> /* Wait for the CCDC to become idle. */
> if (ccdc_sbl_wait_idle(ccdc, 1000)) {
> dev_info(isp->dev, "CCDC won't become idle!\n");
> - isp->crashed |= 1U << ccdc->subdev.entity.id;
> + isp->crashed |= 1U << media_entity_id(&ccdc->subdev.entity);
> omap3isp_pipeline_cancel_stream(pipe);
> return 0;
> }
> diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
> index 3094572f8897..6c89dc40df85 100644
> --- a/drivers/media/platform/omap3isp/ispvideo.c
> +++ b/drivers/media/platform/omap3isp/ispvideo.c
> @@ -235,7 +235,7 @@ static int isp_video_get_graph_data(struct isp_video *video,
> while ((entity = media_entity_graph_walk_next(&graph))) {
> struct isp_video *__video;
>
> - pipe->entities |= 1 << entity->id;
> + pipe->entities |= 1 << media_entity_id(entity);
>
> if (far_end != NULL)
> continue;
> @@ -891,6 +891,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
> struct v4l2_ext_control ctrl;
> unsigned int i;
> int ret;
> + u32 id;
>
> /* Memory-to-memory pipelines have no external subdev. */
> if (pipe->input != NULL)
> @@ -898,7 +899,7 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
>
> for (i = 0; i < ARRAY_SIZE(ents); i++) {
> /* Is the entity part of the pipeline? */
> - if (!(pipe->entities & (1 << ents[i]->id)))
> + if (!(pipe->entities & (1 << media_entity_id(ents[i]))))
> continue;
>
> /* ISP entities have always sink pad == 0. Find source. */
> @@ -950,7 +951,8 @@ static int isp_video_check_external_subdevs(struct isp_video *video,
>
> pipe->external_rate = ctrl.value64;
>
> - if (pipe->entities & (1 << isp->isp_ccdc.subdev.entity.id)) {
> + id = media_entity_id(&isp->isp_ccdc.subdev.entity);
> + if (pipe->entities & (1 << id)) {
> unsigned int rate = UINT_MAX;
> /*
> * Check that maximum allowed CCDC pixel rate isn't
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
