Commit b7319e2b authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Mauro Carvalho Chehab
Browse files

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: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 87d36eb8

drivers/media/mc/mc-entity.c

+4 −4
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/media/media-entity.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

};