summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2011-03-10 09:10:49 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 04:54:29 -0300
commit72f1fc33a76a115e8c67f7b052bd7f6e129cda50 (patch)
tree741f990a208c17c66e791c3108d1c104ee67f63a
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>
-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 2baf7dbdc01..3e9b67bd55b 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)
* and return the queue to an uninitialized state. Might be called even if the
* queue has already been freed.
*/
-static int __vb2_queue_free(struct vb2_queue *q)
+static void __vb2_queue_free(struct vb2_queue *q)
{
unsigned int buffer;
@@ -251,8 +251,6 @@ static int __vb2_queue_free(struct vb2_queue *q)
q->num_buffers = 0;
q->memory = 0;
-
- return 0;
}
/**
@@ -505,9 +503,7 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)
return -EBUSY;
}
- ret = __vb2_queue_free(q);
- if (ret != 0)
- return ret;
+ __vb2_queue_free(q);
/*
* In case of REQBUFS(0) return immediately without calling