media: nxp: 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>
CC: Rui Miguel Silva <rmfrfs@gmail.com>
CC: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
CC: Martin Kepplinger <martink@posteo.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index 15049c6aab3724dbd68f9689475b3eb0926497d7..4c467fb827896b88889e5cb52b012704b6e19dd5 100644 (file)
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -1245,6 +1245,7 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq,
                                      struct device *alloc_devs[])
 {
        struct imx7_csi *csi = vb2_get_drv_priv(vq);
+       unsigned int q_num_bufs = vb2_get_num_buffers(vq);
        struct v4l2_pix_format *pix = &csi->vdev_fmt;
        unsigned int count = *nbuffers;
 
@@ -1254,14 +1255,14 @@ static int imx7_csi_video_queue_setup(struct vb2_queue *vq,
        if (*nplanes) {
                if (*nplanes != 1 || sizes[0] < pix->sizeimage)
                        return -EINVAL;
-               count += vq->num_buffers;
+               count += q_num_bufs;
        }
 
        count = min_t(__u32, IMX7_CSI_VIDEO_MEM_LIMIT / pix->sizeimage, count);
 
        if (*nplanes)
-               *nbuffers = (count < vq->num_buffers) ? 0 :
-                       count - vq->num_buffers;
+               *nbuffers = (count < q_num_bufs) ? 0 :
+                       count - q_num_bufs;
        else
                *nbuffers = count;