From: Marek Szyprowski Date: Thu, 10 Mar 2011 12:10:49 +0000 (-0300) Subject: [media] v4l2: vb2: simplify __vb2_queue_free function X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=72f1fc33a76a115e8c67f7b052bd7f6e129cda50;p=openwrt%2Fstaging%2Fblogic.git [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 Signed-off-by: Kyungmin Park Signed-off-by: Mauro Carvalho Chehab --- 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) * 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