[PATCH v7 44/49] media: cedrus: Stop direct calls to queue num_buffers field

Benjamin Gaignard
2023-09-14T13:33:55Z

Use vb2_get_num_buffers() to avoid using queue num_buffer field directly.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
---
drivers/staging/media/sunxi/cedrus/cedrus_h264.c | 4 +++-
drivers/staging/media/sunxi/cedrus/cedrus_h265.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
index dfb401df138a..bbe5802ea861 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c
@@ -649,11 +649,13 @@ static void cedrus_h264_stop(struct cedrus_ctx *ctx)
struct cedrus_dev *dev = ctx->dev;
struct cedrus_buffer *buf;
struct vb2_queue *vq;
+ unsigned int q_num_bufs;
unsigned int i;

vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+ q_num_bufs = vb2_get_num_buffers(vq);

- for (i = 0; i < vq->num_buffers; i++) {
+ for (i = 0; i < q_num_bufs; i++) {
buf = vb2_to_cedrus_buffer(vb2_get_buffer(vq, i));

if (buf->codec.h264.mv_col_buf_size > 0) {
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
index fc9297232456..533a38316686 100644
--- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
+++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c
@@ -865,11 +865,13 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx)
struct cedrus_dev *dev = ctx->dev;
struct cedrus_buffer *buf;
struct vb2_queue *vq;
+ unsigned int q_num_bufs;
unsigned int i;

vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+ q_num_bufs = vb2_get_num_buffers(vq);

- for (i = 0; i < vq->num_buffers; i++) {
+ for (i = 0; i < q_num_bufs; i++) {
buf = vb2_to_cedrus_buffer(vb2_get_buffer(vq, i));

if (buf->codec.h265.mv_col_buf_size > 0) {
--
2.39.2