[media] v4l2: vb2: simplify __vb2_queue_free function
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 10 Mar 2011 12:10:49 +0000 (09:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 22 Mar 2011 07:54:29 +0000 (04:54 -0300)
__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>
drivers/media/video/videobuf2-core.c

index 2baf7dbdc01db5b8703ecf1d8540d63a41809501..3e9b67bd55b9b2276693dee2c9aef43f91d6c58f 100644 (file)
@@ -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