diff options
| author | Laurent Pinchart | 2015-08-02 22:32:13 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2016-02-19 12:07:07 +0100 |
| commit | f294c2f70e5951e0c2033b9dd50ba4d19a5405f1 (patch) | |
| tree | 06c998f9d7fadc6e2907edb6f767b1f4e090a4e9 /drivers/media/platform | |
| parent | [media] v4l: vsp1: Rename video pipeline functions to use vsp1_video prefix (diff) | |
| download | kernel-qcow2-linux-f294c2f70e5951e0c2033b9dd50ba4d19a5405f1.tar.gz kernel-qcow2-linux-f294c2f70e5951e0c2033b9dd50ba4d19a5405f1.tar.xz kernel-qcow2-linux-f294c2f70e5951e0c2033b9dd50ba4d19a5405f1.zip | |
[media] v4l: vsp1: Extract pipeline initialization code into a function
The code will be reused outside of vsp1_video.c.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_pipe.c | 10 | ||||
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_pipe.h | 1 | ||||
| -rw-r--r-- | drivers/media/platform/vsp1/vsp1_video.c | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c index cdc670b88fcc..584a9d408144 100644 --- a/drivers/media/platform/vsp1/vsp1_pipe.c +++ b/drivers/media/platform/vsp1/vsp1_pipe.c @@ -49,6 +49,16 @@ void vsp1_pipeline_reset(struct vsp1_pipeline *pipe) pipe->uds = NULL; } +void vsp1_pipeline_init(struct vsp1_pipeline *pipe) +{ + mutex_init(&pipe->lock); + spin_lock_init(&pipe->irqlock); + init_waitqueue_head(&pipe->wq); + + INIT_LIST_HEAD(&pipe->entities); + pipe->state = VSP1_PIPELINE_STOPPED; +} + void vsp1_pipeline_run(struct vsp1_pipeline *pipe) { struct vsp1_device *vsp1 = pipe->output->entity.vsp1; diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platform/vsp1/vsp1_pipe.h index f8a099fba973..8553d5a03aa3 100644 --- a/drivers/media/platform/vsp1/vsp1_pipe.h +++ b/drivers/media/platform/vsp1/vsp1_pipe.h @@ -67,6 +67,7 @@ static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e) } void vsp1_pipeline_reset(struct vsp1_pipeline *pipe); +void vsp1_pipeline_init(struct vsp1_pipeline *pipe); void vsp1_pipeline_run(struct vsp1_pipeline *pipe); bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe); diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c index d616cbeb100a..3d5ea4a325ba 100644 --- a/drivers/media/platform/vsp1/vsp1_video.c +++ b/drivers/media/platform/vsp1/vsp1_video.c @@ -1026,11 +1026,7 @@ struct vsp1_video *vsp1_video_create(struct vsp1_device *vsp1, spin_lock_init(&video->irqlock); INIT_LIST_HEAD(&video->irqqueue); - mutex_init(&video->pipe.lock); - spin_lock_init(&video->pipe.irqlock); - INIT_LIST_HEAD(&video->pipe.entities); - init_waitqueue_head(&video->pipe.wq); - video->pipe.state = VSP1_PIPELINE_STOPPED; + vsp1_pipeline_init(&video->pipe); video->pipe.frame_end = vsp1_video_pipeline_frame_end; /* Initialize the media entity... */ |