Commit 0af4e80b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab

media: videobuf2-v4l2: replace if by switch in __fill_vb2_buffer()

Replace 'if' statements by a switch in __fill_vb2_buffer()
in preparation of the next patch.

No other changes.
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5f89ec80
...@@ -190,21 +190,25 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, ...@@ -190,21 +190,25 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
vbuf->sequence = 0; vbuf->sequence = 0;
if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) { if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
if (b->memory == VB2_MEMORY_USERPTR) { switch (b->memory) {
case VB2_MEMORY_USERPTR:
for (plane = 0; plane < vb->num_planes; ++plane) { for (plane = 0; plane < vb->num_planes; ++plane) {
planes[plane].m.userptr = planes[plane].m.userptr =
b->m.planes[plane].m.userptr; b->m.planes[plane].m.userptr;
planes[plane].length = planes[plane].length =
b->m.planes[plane].length; b->m.planes[plane].length;
} }
} break;
if (b->memory == VB2_MEMORY_DMABUF) { case VB2_MEMORY_DMABUF:
for (plane = 0; plane < vb->num_planes; ++plane) { for (plane = 0; plane < vb->num_planes; ++plane) {
planes[plane].m.fd = planes[plane].m.fd =
b->m.planes[plane].m.fd; b->m.planes[plane].m.fd;
planes[plane].length = planes[plane].length =
b->m.planes[plane].length; b->m.planes[plane].length;
} }
break;
default:
break;
} }
/* Fill in driver-provided information for OUTPUT types */ /* Fill in driver-provided information for OUTPUT types */
...@@ -255,14 +259,17 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, ...@@ -255,14 +259,17 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
* the driver should use the allow_zero_bytesused flag to keep * the driver should use the allow_zero_bytesused flag to keep
* old userspace applications working. * old userspace applications working.
*/ */
if (b->memory == VB2_MEMORY_USERPTR) { switch (b->memory) {
case VB2_MEMORY_USERPTR:
planes[0].m.userptr = b->m.userptr; planes[0].m.userptr = b->m.userptr;
planes[0].length = b->length; planes[0].length = b->length;
} break;
case VB2_MEMORY_DMABUF:
if (b->memory == VB2_MEMORY_DMABUF) {
planes[0].m.fd = b->m.fd; planes[0].m.fd = b->m.fd;
planes[0].length = b->length; planes[0].length = b->length;
break;
default:
break;
} }
if (V4L2_TYPE_IS_OUTPUT(b->type)) { if (V4L2_TYPE_IS_OUTPUT(b->type)) {
......
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