[media] v4l: vsp1: Remove struct vsp1_pipeline num_video field

The field is always equal to the num_inputs field plus one, remove the
duplicate.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index e9a6f9f90c90a40c77c62727d91231fd5ca42c2e..381447a4631aa6aeb155a5aaf85dbe6e9e4d0011 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -403,7 +403,6 @@ static void __vsp1_pipeline_cleanup(struct vsp1_pipeline *pipe)
        INIT_LIST_HEAD(&pipe->entities);
        pipe->state = VSP1_PIPELINE_STOPPED;
        pipe->buffers_ready = 0;
-       pipe->num_video = 0;
        pipe->num_inputs = 0;
        pipe->output = NULL;
        pipe->bru = NULL;
@@ -436,10 +435,8 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
                struct vsp1_rwpf *rwpf;
                struct vsp1_entity *e;
 
-               if (is_media_entity_v4l2_io(entity)) {
-                       pipe->num_video++;
+               if (is_media_entity_v4l2_io(entity))
                        continue;
-               }
 
                subdev = media_entity_to_v4l2_subdev(entity);
                e = to_vsp1_entity(subdev);
@@ -907,7 +904,7 @@ static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
        int ret;
 
        mutex_lock(&pipe->lock);
-       if (pipe->stream_count == pipe->num_video - 1) {
+       if (pipe->stream_count == pipe->num_inputs) {
                if (pipe->uds) {
                        struct vsp1_uds *uds = to_uds(&pipe->uds->subdev);
 

diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h
index 21096d82af053e91da69a3c16ad43a115dbe3769..e9d0e1ab916280983e5d5c72ab123d44a0c5fd4c 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_video.h
+++ b/drivers/media/platform/vsp1/vsp1_video.h
@@ -75,7 +75,6 @@ struct vsp1_pipeline {
        unsigned int stream_count;
        unsigned int buffers_ready;
 
-       unsigned int num_video;
        unsigned int num_inputs;
        struct vsp1_rwpf *inputs[VSP1_MAX_RPF];
        struct vsp1_rwpf *output;