diff options
| author | Laurent Pinchart | 2013-12-04 01:28:37 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-12-11 09:53:14 +0100 |
| commit | a0fe029ccc648fb7f5dfcba5d4345040db574a53 (patch) | |
| tree | 66b5665d65720304e61747c74e528b4e470625b2 /drivers/staging/media/omap4iss/iss_video.c | |
| parent | [media] v4l: omap4iss: Don't split log strings on multiple lines (diff) | |
| download | kernel-qcow2-linux-a0fe029ccc648fb7f5dfcba5d4345040db574a53.tar.gz kernel-qcow2-linux-a0fe029ccc648fb7f5dfcba5d4345040db574a53.tar.xz kernel-qcow2-linux-a0fe029ccc648fb7f5dfcba5d4345040db574a53.zip | |
[media] v4l: omap4iss: Restrict line lengths to 80 characters where possible
Pure CodingStyle fixes.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/staging/media/omap4iss/iss_video.c')
| -rw-r--r-- | drivers/staging/media/omap4iss/iss_video.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c index 3e543d92c8d8..0a7137bcdcd2 100644 --- a/drivers/staging/media/omap4iss/iss_video.c +++ b/drivers/staging/media/omap4iss/iss_video.c @@ -282,7 +282,8 @@ iss_video_check_format(struct iss_video *video, struct iss_video_fh *vfh) * Video queue operations */ -static int iss_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt, +static int iss_video_queue_setup(struct vb2_queue *vq, + const struct v4l2_format *fmt, unsigned int *count, unsigned int *num_planes, unsigned int sizes[], void *alloc_ctxs[]) { @@ -298,7 +299,7 @@ static int iss_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format alloc_ctxs[0] = video->alloc_ctx; - *count = min(*count, (unsigned int)(video->capture_mem / PAGE_ALIGN(sizes[0]))); + *count = min(*count, video->capture_mem / PAGE_ALIGN(sizes[0])); return 0; } @@ -425,11 +426,13 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video) * first, so the input number might lag behind by 1 in some cases. */ if (video == pipe->output && !pipe->do_propagation) - buf->vb.v4l2_buf.sequence = atomic_inc_return(&pipe->frame_number); + buf->vb.v4l2_buf.sequence = + atomic_inc_return(&pipe->frame_number); else buf->vb.v4l2_buf.sequence = atomic_read(&pipe->frame_number); - vb2_buffer_done(&buf->vb, pipe->error ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); + vb2_buffer_done(&buf->vb, pipe->error ? + VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); pipe->error = false; spin_lock_irqsave(&video->qlock, flags); |