aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/videobuf2-core.c
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2011-03-10 07:10:49 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 03:54:29 -0400
commit72f1fc33a76a115e8c67f7b052bd7f6e129cda50 (patch)
tree741f990a208c17c66e791c3108d1c104ee67f63a /drivers/media/video/videobuf2-core.c
parent31901a078af29c33c736dcbf815656920e904632 (diff)
[media] v4l2: vb2: simplify __vb2_queue_free function
__vb2_queue_free function doesn't really return anything useful. This patch removes support for the return value to simplify the code. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/videobuf2-core.c')
-rw-r--r--drivers/media/video/videobuf2-core.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c
index 2baf7dbdc01d..3e9b67bd55b9 100644
--- a/drivers/media/video/videobuf2-core.c
+++ b/drivers/media/video/videobuf2-core.c
@@ -227,7 +227,7 @@ static void __vb2_free_mem(struct vb2_queue *q)
227 * and return the queue to an uninitialized state. Might be called even if the 227 * and return the queue to an uninitialized state. Might be called even if the
228 * queue has already been freed. 228 * queue has already been freed.
229 */ 229 */
230static int __vb2_queue_free(struct vb2_queue *q) 230static void __vb2_queue_free(struct vb2_queue *q)
231{ 231{
232 unsigned int buffer; 232 unsigned int buffer;
233 233
@@ -251,8 +251,6 @@ static int __vb2_queue_free(struct vb2_queue *q)
251 251
252 q->num_buffers = 0; 252 q->num_buffers = 0;
253 q->memory = 0; 253 q->memory = 0;
254
255 return 0;
256} 254}
257 255
258/** 256/**
@@ -505,9 +503,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
505 return -EBUSY; 503 return -EBUSY;
506 } 504 }
507 505
508 ret = __vb2_queue_free(q); 506 __vb2_queue_free(q);
509 if (ret != 0)
510 return ret;
511 507
512 /* 508 /*
513 * In case of REQBUFS(0) return immediately without calling 509 * In case of REQBUFS(0) return immediately without calling