media: usb: cx231xx: Stop direct calls to queue num_buffers field

Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index fe4410a5e128489557dd1cc124026da43a38955f..45973fe690b227f9e31e43a2b90505cad5c37045 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -1218,12 +1218,13 @@ static int queue_setup(struct vb2_queue *vq,
 {
        struct cx231xx *dev = vb2_get_drv_priv(vq);
        unsigned int size = mpeglinesize * mpeglines;
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
        dev->ts1.ts_packet_size  = mpeglinesize;
        dev->ts1.ts_packet_count = mpeglines;
 
-       if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF)
-               *nbuffers = CX231XX_MIN_BUF - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < CX231XX_MIN_BUF)
+               *nbuffers = CX231XX_MIN_BUF - q_num_bufs;
 
        if (*nplanes)
                return sizes[0] < size ? -EINVAL : 0;

diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index e23b8ccd79d46a289d590cdcce01d9298501ca71..c8eb4222319de0ea3c8c80f74f8361620cbc1785 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -714,11 +714,12 @@ static int queue_setup(struct vb2_queue *vq,
                       unsigned int sizes[], struct device *alloc_devs[])
 {
        struct cx231xx *dev = vb2_get_drv_priv(vq);
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
 
        dev->size = (dev->width * dev->height * dev->format->depth + 7) >> 3;
 
-       if (vq->num_buffers + *nbuffers < CX231XX_MIN_BUF)
-               *nbuffers = CX231XX_MIN_BUF - vq->num_buffers;
+       if (q_num_bufs + *nbuffers < CX231XX_MIN_BUF)
+               *nbuffers = CX231XX_MIN_BUF - q_num_bufs;
 
        if (*nplanes)
                return sizes[0] < dev->size ? -EINVAL : 0;