1 files changed, 28 insertions, 23 deletions

diff --git a/drivers/media/platform/vim2m.c b/drivers/media/platform/vim2m.c
index d47cfba32c58..7c3ced045304 100644
--- a/drivers/media/platform/vim2m.c
+++ b/drivers/media/platform/vim2m.c
@@ -197,8 +197,8 @@ static struct vim2m_q_data *get_q_data(struct vim2m_ctx *ctx,
 
 
 static int device_process(struct vim2m_ctx *ctx,
-                          struct vb2_buffer *in_vb,
-                          struct vb2_buffer *out_vb)
+                          struct vb2_v4l2_buffer *in_vb,
+                          struct vb2_v4l2_buffer *out_vb)
 {
         struct vim2m_dev *dev = ctx->dev;
         struct vim2m_q_data *q_data;
@@ -213,15 +213,16 @@ static int device_process(struct vim2m_ctx *ctx,
         height  = q_data->height;
         bytesperline    = (q_data->width * q_data->fmt->depth) >> 3;
 
-        p_in = vb2_plane_vaddr(in_vb, 0);
-        p_out = vb2_plane_vaddr(out_vb, 0);
+        p_in = vb2_plane_vaddr(&in_vb->vb2_buf, 0);
+        p_out = vb2_plane_vaddr(&out_vb->vb2_buf, 0);
         if (!p_in || !p_out) {
                 v4l2_err(&dev->v4l2_dev,
                          "Acquiring kernel pointers to buffers failed\n");
                 return -EFAULT;
         }
 
-        if (vb2_plane_size(in_vb, 0) > vb2_plane_size(out_vb, 0)) {
+        if (vb2_plane_size(&in_vb->vb2_buf, 0) >
+                        vb2_plane_size(&out_vb->vb2_buf, 0)) {
                 v4l2_err(&dev->v4l2_dev, "Output buffer is too small\n");
                 return -EINVAL;
         }
@@ -231,13 +232,15 @@ static int device_process(struct vim2m_ctx *ctx,
         bytes_left = bytesperline - tile_w * MEM2MEM_NUM_TILES;
         w = 0;
 
-        out_vb->v4l2_buf.sequence = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
-        in_vb->v4l2_buf.sequence = q_data->sequence++;
-        out_vb->v4l2_buf.timestamp = in_vb->v4l2_buf.timestamp;
-        if (in_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE)
-                out_vb->v4l2_buf.timecode = in_vb->v4l2_buf.timecode;
-        out_vb->v4l2_buf.field = in_vb->v4l2_buf.field;
-        out_vb->v4l2_buf.flags = in_vb->v4l2_buf.flags &
+        out_vb->sequence =
+                get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
+        in_vb->sequence = q_data->sequence++;
+        out_vb->timestamp = in_vb->timestamp;
+
+        if (in_vb->flags & V4L2_BUF_FLAG_TIMECODE)
+                out_vb->timecode = in_vb->timecode;
+        out_vb->field = in_vb->field;
+        out_vb->flags = in_vb->flags &
                 (V4L2_BUF_FLAG_TIMECODE |
                  V4L2_BUF_FLAG_KEYFRAME |
                  V4L2_BUF_FLAG_PFRAME |
@@ -371,7 +374,7 @@ static void device_run(void *priv)
 {
         struct vim2m_ctx *ctx = priv;
         struct vim2m_dev *dev = ctx->dev;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
 
         src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
         dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
@@ -386,7 +389,7 @@ static void device_isr(unsigned long priv)
 {
         struct vim2m_dev *vim2m_dev = (struct vim2m_dev *)priv;
         struct vim2m_ctx *curr_ctx;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
         unsigned long flags;
 
         curr_ctx = v4l2_m2m_get_curr_priv(vim2m_dev->m2m_dev);
@@ -744,6 +747,7 @@ static int vim2m_queue_setup(struct vb2_queue *vq,
 
 static int vim2m_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
         struct vim2m_q_data *q_data;
 
@@ -751,9 +755,9 @@ static int vim2m_buf_prepare(struct vb2_buffer *vb)
 
         q_data = get_q_data(ctx, vb->vb2_queue->type);
         if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
-                if (vb->v4l2_buf.field == V4L2_FIELD_ANY)
-                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
-                if (vb->v4l2_buf.field != V4L2_FIELD_NONE) {
+                if (vbuf->field == V4L2_FIELD_ANY)
+                        vbuf->field = V4L2_FIELD_NONE;
+                if (vbuf->field != V4L2_FIELD_NONE) {
                         dprintk(ctx->dev, "%s field isn't supported\n",
                                         __func__);
                         return -EINVAL;
@@ -773,9 +777,10 @@ static int vim2m_buf_prepare(struct vb2_buffer *vb)
 
 static void vim2m_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
 
-        v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+        v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
 }
 
 static int vim2m_start_streaming(struct vb2_queue *q, unsigned count)
@@ -790,18 +795,18 @@ static int vim2m_start_streaming(struct vb2_queue *q, unsigned count)
 static void vim2m_stop_streaming(struct vb2_queue *q)
 {
         struct vim2m_ctx *ctx = vb2_get_drv_priv(q);
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
         unsigned long flags;
 
         for (;;) {
                 if (V4L2_TYPE_IS_OUTPUT(q->type))
-                        vb = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+                        vbuf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
                 else
-                        vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-                if (vb == NULL)
+                        vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
+                if (vbuf == NULL)
                         return;
                 spin_lock_irqsave(&ctx->dev->irqlock, flags);
-                v4l2_m2m_buf_done(vb, VB2_BUF_STATE_ERROR);
+                v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_ERROR);
                 spin_unlock_irqrestore(&ctx->dev->irqlock, flags);
         }
 }