media: mc: entity: Rename streaming_count -> start_count

'streaming_count' is a bit misleading name, as the count is increased
with media_pipeline_start(). Let's rename it to 'start_count' instead.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/mc/mc-entity.c b/drivers/media/mc/mc-entity.c
index afd1bd7ff7b6e995043362308ad7ae0d42b273a7..67d009b617ce18976c76ffb3c74c208f5fc3824c 100644 (file)
--- a/drivers/media/mc/mc-entity.c
+++ b/drivers/media/mc/mc-entity.c
@@ -415,8 +415,8 @@ __must_check int __media_pipeline_start(struct media_entity *entity,
        struct media_link *link;
        int ret;
 
-       if (pipe->streaming_count) {
-               pipe->streaming_count++;
+       if (pipe->start_count) {
+               pipe->start_count++;
                return 0;
        }
 
@@ -499,7 +499,7 @@ __must_check int __media_pipeline_start(struct media_entity *entity,
                }
        }
 
-       pipe->streaming_count++;
+       pipe->start_count++;
 
        return 0;
 
@@ -552,7 +552,7 @@ void __media_pipeline_stop(struct media_entity *entity)
        if (WARN_ON(!pipe))
                return;
 
-       if (--pipe->streaming_count)
+       if (--pipe->start_count)
                return;
 
        media_graph_walk_start(graph, entity);

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
index c66963a2ccd9916976dd448d7d721136459f8d28..6ef09579dc21be0af83f418fee91046cd38e5a20 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
@@ -926,7 +926,7 @@ static void rkisp1_pipeline_stream_disable(struct rkisp1_capture *cap)
         * If the other capture is streaming, isp and sensor nodes shouldn't
         * be disabled, skip them.
         */
-       if (rkisp1->pipe.streaming_count < 2)
+       if (rkisp1->pipe.start_count < 2)
                v4l2_subdev_call(&rkisp1->isp.sd, video, s_stream, false);
 
        v4l2_subdev_call(&rkisp1->resizer_devs[cap->id].sd, video, s_stream,
@@ -956,7 +956,7 @@ static int rkisp1_pipeline_stream_enable(struct rkisp1_capture *cap)
         * If the other capture is streaming, isp and sensor nodes are already
         * enabled, skip them.
         */
-       if (rkisp1->pipe.streaming_count > 1)
+       if (rkisp1->pipe.start_count > 1)
                return 0;
 
        ret = v4l2_subdev_call(&rkisp1->isp.sd, video, s_stream, true);

diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 4a67b1dfdc696bf53ef25e8d639e2cd0a09e363a..198ea1416ddd52f9175f88e96c1026f8e91eb7cd 100644 (file)
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -100,11 +100,11 @@ struct media_graph {
 /**
  * struct media_pipeline - Media pipeline related information
  *
- * @streaming_count:   Streaming start count - streaming stop count
+ * @start_count:       Media pipeline start - stop count
  * @graph:             Media graph walk during pipeline start / stop
  */
 struct media_pipeline {
-       int streaming_count;
+       int start_count;
        struct media_graph graph;
 };