Re: [PATCH v10 20/54] media: Remove duplicated index vs q->num_buffers check

From: Hans Verkuil
Date: Wed Oct 11 2023 - 04:54:48 EST


Subject should start with "media: videobuf2:".

Regards,

Hans

On 03/10/2023 10:06, Benjamin Gaignard wrote:
> vb2_get_buffer() already checks if the requested index is valid.
> Stop duplicating this kind of check everywhere.
>
> Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
> ---
> drivers/media/common/videobuf2/videobuf2-v4l2.c | 13 -------------
> 1 file changed, 13 deletions(-)
>
> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> index 42da0adc052a..cf881c8d8d4d 100644
> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> @@ -378,11 +378,6 @@ static int vb2_queue_or_prepare_buf(struct vb2_queue *q, struct media_device *md
> return -EINVAL;
> }
>
> - if (b->index >= q->num_buffers) {
> - dprintk(q, 1, "%s: buffer index out of range\n", opname);
> - return -EINVAL;
> - }
> -
> vb = vb2_get_buffer(q, b->index);
> if (!vb) {
> dprintk(q, 1, "%s: buffer %u is NULL\n", opname, b->index);
> @@ -833,10 +828,6 @@ int vb2_qbuf(struct vb2_queue *q, struct media_device *mdev,
> return -EBUSY;
> }
>
> - if (b->index >= q->num_buffers) {
> - dprintk(q, 1, "buffer index out of range\n");
> - return -EINVAL;
> - }
> vb = vb2_get_buffer(q, b->index);
> if (!vb) {
> dprintk(q, 1, "can't find the requested buffer %u\n", b->index);
> @@ -908,10 +899,6 @@ int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb)
> {
> struct vb2_buffer *vb;
>
> - if (eb->index >= q->num_buffers) {
> - dprintk(q, 1, "buffer index out of range\n");
> - return -EINVAL;
> - }
> vb = vb2_get_buffer(q, eb->index);
> if (!vb) {
> dprintk(q, 1, "can't find the requested buffer %u\n", eb->index);