openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: vsp1: Rename video pipeline functions to use vsp1_video prefix 

Those functions are specific to video nodes, rename them for
consistency.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Laurent Pinchart 2015-08-02 17:29:03 -03:00 committed by Mauro Carvalho Chehab
parent dba4a18073
commit 945f127677
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/platform/vsp1/vsp1_video.c
View File

@ -298,9 +298,9 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
* Pipeline Management
*/
static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
struct vsp1_rwpf *input,
struct vsp1_rwpf *output)
static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
struct vsp1_rwpf *input,
struct vsp1_rwpf *output)
{
struct vsp1_entity *entity;
struct media_entity_enum ent_enum;
@ -391,8 +391,8 @@ static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
return rval;
}
static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
struct vsp1_video *video)
static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe,
struct vsp1_video *video)
{
struct media_entity_graph graph;
struct media_entity *entity = &video->video.entity;
@ -452,8 +452,8 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
* contains no loop and that all branches end at the output WPF.
*/
for (i = 0; i < pipe->num_inputs; ++i) {
ret = vsp1_pipeline_validate_branch(pipe, pipe->inputs[i],
pipe->output);
ret = vsp1_video_pipeline_validate_branch(pipe, pipe->inputs[i],
pipe->output);
if (ret < 0)
goto error;
}
@ -465,8 +465,8 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
return ret;
}
static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
struct vsp1_video *video)
static int vsp1_video_pipeline_init(struct vsp1_pipeline *pipe,
struct vsp1_video *video)
{
int ret;
@ -474,7 +474,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
/* If we're the first user validate and initialize the pipeline. */
if (pipe->use_count == 0) {
ret = vsp1_pipeline_validate(pipe, video);
ret = vsp1_video_pipeline_validate(pipe, video);
if (ret < 0)
goto done;
}
@ -487,7 +487,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
return ret;
}
static void vsp1_pipeline_cleanup(struct vsp1_pipeline *pipe)
static void vsp1_video_pipeline_cleanup(struct vsp1_pipeline *pipe)
{
mutex_lock(&pipe->lock);
@ -755,7 +755,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
}
mutex_unlock(&pipe->lock);
vsp1_pipeline_cleanup(pipe);
vsp1_video_pipeline_cleanup(pipe);
media_entity_pipeline_stop(&video->video.entity);
/* Remove all buffers from the IRQ queue. */
@ -896,7 +896,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
if (ret < 0)
goto err_stop;
ret = vsp1_pipeline_init(pipe, video);
ret = vsp1_video_pipeline_init(pipe, video);
if (ret < 0)
goto err_stop;
@ -908,7 +908,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
return 0;
err_cleanup:
vsp1_pipeline_cleanup(pipe);
vsp1_video_pipeline_cleanup(pipe);
err_stop:
media_entity_pipeline_stop(&video->video.entity);
return ret;