media: replace setting of bytesused with vb2_set_plane_payload

In many places the bytesused field of struct vb2_buffer is set
directly. Replace that with the function call
vb2_set_plane_payload

Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/allegro-dvt/allegro-core.c b/drivers/media/platform/allegro-dvt/allegro-core.c
index c8156da..4a3d06c 100644 (file)
--- a/drivers/media/platform/allegro-dvt/allegro-core.c
+++ b/drivers/media/platform/allegro-dvt/allegro-core.c
@@ -2815,7 +2815,7 @@ static void allegro_buf_queue(struct vb2_buffer *vb)
                unsigned int i;
 
                for (i = 0; i < vb->num_planes; i++)
-                       vb->planes[i].bytesused = 0;
+                       vb2_set_plane_payload(vb, i, 0);
 
                vbuf->field = V4L2_FIELD_NONE;
                vbuf->sequence = channel->csequence++;

diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 03f9055..ffb046e 100644 (file)
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -936,7 +936,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)
 
        if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
                while ((dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx))) {
-                       dst_buf->vb2_buf.planes[0].bytesused = 0;
+                       vb2_set_plane_payload(&dst_buf->vb2_buf, 0, 0);
                        v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
                }
                /* STREAMOFF on the CAPTURE queue completes any ongoing flush */
@@ -1045,7 +1045,7 @@ static int mtk_venc_encode_header(void *priv)
                        NULL, &bs_buf, &enc_result);
 
        if (ret) {
-               dst_buf->vb2_buf.planes[0].bytesused = 0;
+               vb2_set_plane_payload(&dst_buf->vb2_buf, 0, 0);
                ctx->state = MTK_STATE_ABORT;
                v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
                mtk_v4l2_err("venc_if_encode failed=%d", ret);
@@ -1060,7 +1060,7 @@ static int mtk_venc_encode_header(void *priv)
        }
 
        ctx->state = MTK_STATE_HEADER;
-       dst_buf->vb2_buf.planes[0].bytesused = enc_result.bs_size;
+       vb2_set_plane_payload(&dst_buf->vb2_buf, 0, enc_result.bs_size);
        v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
 
        return 0;
@@ -1209,12 +1209,12 @@ static void mtk_venc_worker(struct work_struct *work)
 
        if (ret) {
                v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
-               dst_buf->vb2_buf.planes[0].bytesused = 0;
+               vb2_set_plane_payload(&dst_buf->vb2_buf, 0, 0);
                v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_ERROR);
                mtk_v4l2_err("venc_if_encode failed=%d", ret);
        } else {
                v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
-               dst_buf->vb2_buf.planes[0].bytesused = enc_result.bs_size;
+               vb2_set_plane_payload(&dst_buf->vb2_buf, 0, enc_result.bs_size);
                v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE);
                mtk_v4l2_debug(2, "venc_if_encode bs size=%d",
                                 enc_result.bs_size);

diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/media/test-drivers/vicodec/vicodec-core.c
index 33f1c89..be43f7d 100644 (file)
--- a/drivers/media/test-drivers/vicodec/vicodec-core.c
+++ b/drivers/media/test-drivers/vicodec/vicodec-core.c
@@ -1443,7 +1443,7 @@ static void vicodec_buf_queue(struct vb2_buffer *vb)
                unsigned int i;
 
                for (i = 0; i < vb->num_planes; i++)
-                       vb->planes[i].bytesused = 0;
+                       vb2_set_plane_payload(vb, i, 0);
 
                vbuf->field = V4L2_FIELD_NONE;
                vbuf->sequence =

diff --git a/drivers/media/usb/go7007/go7007-driver.c b/drivers/media/usb/go7007/go7007-driver.c
index 6650eab..0c24e29 100644 (file)
--- a/drivers/media/usb/go7007/go7007-driver.c
+++ b/drivers/media/usb/go7007/go7007-driver.c
@@ -516,7 +516,7 @@ void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
                if (vb && vb->vb.vb2_buf.planes[0].bytesused >=
                                GO7007_BUF_SIZE - 3) {
                        v4l2_info(&go->v4l2_dev, "dropping oversized frame\n");
-                       vb->vb.vb2_buf.planes[0].bytesused = 0;
+                       vb2_set_plane_payload(&vb->vb.vb2_buf, 0, 0);
                        vb->frame_offset = 0;
                        vb->modet_active = 0;
                        vb = go->active_buf = NULL;

diff --git a/drivers/staging/media/meson/vdec/vdec_helpers.c b/drivers/staging/media/meson/vdec/vdec_helpers.c
index b9125c2..203d7af 100644 (file)
--- a/drivers/staging/media/meson/vdec/vdec_helpers.c
+++ b/drivers/staging/media/meson/vdec/vdec_helpers.c
@@ -276,13 +276,13 @@ static void dst_buf_done(struct amvdec_session *sess,
 
        switch (sess->pixfmt_cap) {
        case V4L2_PIX_FMT_NV12M:
-               vbuf->vb2_buf.planes[0].bytesused = output_size;
-               vbuf->vb2_buf.planes[1].bytesused = output_size / 2;
+               vb2_set_plane_payload(&vbuf->vb2_buf, 0, output_size);
+               vb2_set_plane_payload(&vbuf->vb2_buf, 1, output_size / 2);
                break;
        case V4L2_PIX_FMT_YUV420M:
-               vbuf->vb2_buf.planes[0].bytesused = output_size;
-               vbuf->vb2_buf.planes[1].bytesused = output_size / 4;
-               vbuf->vb2_buf.planes[2].bytesused = output_size / 4;
+               vb2_set_plane_payload(&vbuf->vb2_buf, 0, output_size);
+               vb2_set_plane_payload(&vbuf->vb2_buf, 1, output_size / 4);
+               vb2_set_plane_payload(&vbuf->vb2_buf, 2, output_size / 4);
                break;
        }