Commit 945f1276 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

[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: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent dba4a180
...@@ -298,7 +298,7 @@ static int __vsp1_video_try_format(struct vsp1_video *video, ...@@ -298,7 +298,7 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
* Pipeline Management * Pipeline Management
*/ */
static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe, static int vsp1_video_pipeline_validate_branch(struct vsp1_pipeline *pipe,
struct vsp1_rwpf *input, struct vsp1_rwpf *input,
struct vsp1_rwpf *output) struct vsp1_rwpf *output)
{ {
...@@ -391,7 +391,7 @@ static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe, ...@@ -391,7 +391,7 @@ static int vsp1_pipeline_validate_branch(struct vsp1_pipeline *pipe,
return rval; return rval;
} }
static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe, static int vsp1_video_pipeline_validate(struct vsp1_pipeline *pipe,
struct vsp1_video *video) struct vsp1_video *video)
{ {
struct media_entity_graph graph; struct media_entity_graph graph;
...@@ -452,7 +452,7 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe, ...@@ -452,7 +452,7 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
* contains no loop and that all branches end at the output WPF. * contains no loop and that all branches end at the output WPF.
*/ */
for (i = 0; i < pipe->num_inputs; ++i) { for (i = 0; i < pipe->num_inputs; ++i) {
ret = vsp1_pipeline_validate_branch(pipe, pipe->inputs[i], ret = vsp1_video_pipeline_validate_branch(pipe, pipe->inputs[i],
pipe->output); pipe->output);
if (ret < 0) if (ret < 0)
goto error; goto error;
...@@ -465,7 +465,7 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe, ...@@ -465,7 +465,7 @@ static int vsp1_pipeline_validate(struct vsp1_pipeline *pipe,
return ret; return ret;
} }
static int vsp1_pipeline_init(struct vsp1_pipeline *pipe, static int vsp1_video_pipeline_init(struct vsp1_pipeline *pipe,
struct vsp1_video *video) struct vsp1_video *video)
{ {
int ret; int ret;
...@@ -474,7 +474,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe, ...@@ -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 we're the first user validate and initialize the pipeline. */
if (pipe->use_count == 0) { if (pipe->use_count == 0) {
ret = vsp1_pipeline_validate(pipe, video); ret = vsp1_video_pipeline_validate(pipe, video);
if (ret < 0) if (ret < 0)
goto done; goto done;
} }
...@@ -487,7 +487,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe, ...@@ -487,7 +487,7 @@ static int vsp1_pipeline_init(struct vsp1_pipeline *pipe,
return ret; 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); mutex_lock(&pipe->lock);
...@@ -755,7 +755,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq) ...@@ -755,7 +755,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
} }
mutex_unlock(&pipe->lock); mutex_unlock(&pipe->lock);
vsp1_pipeline_cleanup(pipe); vsp1_video_pipeline_cleanup(pipe);
media_entity_pipeline_stop(&video->video.entity); media_entity_pipeline_stop(&video->video.entity);
/* Remove all buffers from the IRQ queue. */ /* Remove all buffers from the IRQ queue. */
...@@ -896,7 +896,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -896,7 +896,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
if (ret < 0) if (ret < 0)
goto err_stop; goto err_stop;
ret = vsp1_pipeline_init(pipe, video); ret = vsp1_video_pipeline_init(pipe, video);
if (ret < 0) if (ret < 0)
goto err_stop; goto err_stop;
...@@ -908,7 +908,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type) ...@@ -908,7 +908,7 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
return 0; return 0;
err_cleanup: err_cleanup:
vsp1_pipeline_cleanup(pipe); vsp1_video_pipeline_cleanup(pipe);
err_stop: err_stop:
media_entity_pipeline_stop(&video->video.entity); media_entity_pipeline_stop(&video->video.entity);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment