leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

media: mc: entity: Rename streaming_count -> start_count

Browse Source 
'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>
This commit is contained in:
Tomi Valkeinen 2022-08-31 16:13:27 +02:00 committed by Mauro Carvalho Chehab
parent 87d36eb84d
commit b7319e2bd7
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/mc/mc-entity.c
View File

@ -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);

4
drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c
View File

@ -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);

4
include/media/media-entity.h
View File

@ -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;
};