[media] staging: omap4iss: get entity ID using media_entity_id()

Accessing media_entity ID should now use media_entity_id() macro to
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>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index e27a988540a6b73bb188ec52f8662f71523747c0..5fc3675b190f4e60affd9bc2945d8dbfc16719a8 100644 (file)
--- 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 194c41ef822c991bb01cd146f3098bcac1863c92..dd8ff03912a7110527f72769a5c20dac4fbdbe67 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -782,7 +782,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.