diff options
| author |   Hans Verkuil <hans.verkuil@cisco.com> | 2018-08-14 05:29:40 -0400 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-08-31 11:13:52 -0400 |
| commit | 0af4e80bf24a3caf56cd94d6dbe6a8bb72536b1d (patch) | |
| tree | bbeb8c7c49147b97a9d3314d04ee492bf8d1bcc7 | |
| parent | media: videobuf2-v4l2: move __fill_v4l2_buffer() function (diff) | |
| download | linux-dev-0af4e80bf24a3caf56cd94d6dbe6a8bb72536b1d.tar.xz linux-dev-0af4e80bf24a3caf56cd94d6dbe6a8bb72536b1d.zip | |
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: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/common/videobuf2/videobuf2-v4l2.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c index 408fd7ce9c09..57848ddc584f 100644 --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c @@ -190,21 +190,25 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, vbuf->sequence = 0; 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) { planes[plane].m.userptr = b->m.planes[plane].m.userptr; planes[plane].length = b->m.planes[plane].length; } - } - if (b->memory == VB2_MEMORY_DMABUF) { + break; + case VB2_MEMORY_DMABUF: for (plane = 0; plane < vb->num_planes; ++plane) { planes[plane].m.fd = b->m.planes[plane].m.fd; planes[plane].length = b->m.planes[plane].length; } + break; + default: + break; } /* Fill in driver-provided information for OUTPUT types */ @@ -255,14 +259,17 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, * the driver should use the allow_zero_bytesused flag to keep * 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].length = b->length; - } - - if (b->memory == VB2_MEMORY_DMABUF) { + break; + case VB2_MEMORY_DMABUF: planes[0].m.fd = b->m.fd; planes[0].length = b->length; + break; + default: + break; } if (V4L2_TYPE_IS_OUTPUT(b->type)) { |