[media] media: videobuf2: Restructure vb2_buffer

Remove v4l2 stuff - v4l2_buf, v4l2_plane - from struct vb2_buffer. Add new member variables - bytesused, length, offset, userptr, fd, data_offset - to struct vb2_plane in order to cover all information of v4l2_plane. struct vb2_plane { <snip> unsigned int bytesused; unsigned int length; union { unsigned int offset; unsigned long userptr; int fd; } m; unsigned int data_offset; } Replace v4l2_buf with new member variables - index, type, memory - which are common fields for buffer management. struct vb2_buffer { <snip> unsigned int index; unsigned int type; unsigned int memory; unsigned int num_planes; struct vb2_plane planes[VIDEO_MAX_PLANES]; <snip> }; v4l2 specific fields - flags, field, timestamp, timecode, sequence - are moved to vb2_v4l2_buffer in videobuf2-v4l2.c struct vb2_v4l2_buffer { struct vb2_buffer vb2_buf; __u32 flags; __u32 field; struct timeval timestamp; struct v4l2_timecode timecode; __u32 sequence; }; Signed-off-by: Junghak Sung <jh1009.sung@samsung.com> Signed-off-by: Geunyoung Kim <nenggun.kim@samsung.com> Acked-by: Seung-Woo Kim <sw0312.kim@samsung.com> Acked-by: Inki Dae <inki.dae@samsung.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
author: Junghak Sung <jh1009.sung@samsung.com> 2015-09-22 09:30:30 -0400
committer: Mauro Carvalho Chehab <mchehab@osg.samsung.com> 2015-10-01 08:04:43 -0400
commit: 2d7007153f0c9b1dd00c01894df7d26ddc32b79f (patch)
tree: 8320f9d22f45dd7dcea64088b50ff706bb0082b2
parent: c139990e842d550db2f59bd4f5993bba90f140e0 (diff)
137 files changed, 1647 insertions, 1263 deletions
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 3f117637e832..98d094587e85 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -38,6 +38,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-dev.h>
 #include <media/v4l2-ioctl.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-sg.h>
 /* read 512 bytes from endpoint 0x86 -> get header + blobs */
@@ -163,7 +164,7 @@ struct sur40_state {
 };
 struct sur40_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -420,7 +421,7 @@ static void sur40_process_video(struct sur40_state *sur40)
        dev_dbg(sur40->dev, "header acquired\n");
-        sgt = vb2_dma_sg_plane_desc(&new_buf->vb, 0);
+        sgt = vb2_dma_sg_plane_desc(&new_buf->vb.vb2_buf, 0);
        result = usb_sg_init(&sgr, sur40->usbdev,
                usb_rcvbulkpipe(sur40->usbdev, VIDEO_ENDPOINT), 0,
@@ -443,15 +444,15 @@ static void sur40_process_video(struct sur40_state *sur40)
                goto err_poll;
        /* mark as finished */
-        v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&new_buf->vb.timestamp);
-        new_buf->vb.v4l2_buf.sequence = sur40->sequence++;
+        new_buf->vb.sequence = sur40->sequence++;
-        new_buf->vb.v4l2_buf.field = V4L2_FIELD_NONE;
+        new_buf->vb.field = V4L2_FIELD_NONE;
-        vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&new_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        dev_dbg(sur40->dev, "buffer marked done\n");
        return;
 err_poll:
-        vb2_buffer_done(&new_buf->vb, VB2_BUF_STATE_ERROR);
+        vb2_buffer_done(&new_buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
 }
 /* Initialize input device parameters. */
@@ -701,7 +702,7 @@ static void return_all_buffers(struct sur40_state *sur40,
        spin_lock(&sur40->qlock);
        list_for_each_entry_safe(buf, node, &sur40->buf_list, list) {
-                vb2_buffer_done(&buf->vb, state);
+                vb2_buffer_done(&buf->vb.vb2_buf, state);
                list_del(&buf->list);
        }
        spin_unlock(&sur40->qlock);
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index d5b994f17612..bf306a230eb0 100644
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -29,6 +29,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <linux/platform_device.h>
@@ -107,7 +108,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
 /* intermediate buffers with raw data from the USB device */
 struct rtl2832_sdr_frame_buf {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -304,13 +306,13 @@ static void rtl2832_sdr_urb_complete(struct urb *urb)
                }
                /* fill framebuffer */
-                ptr = vb2_plane_vaddr(&fbuf->vb, 0);
+                ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
                len = rtl2832_sdr_convert_stream(dev, ptr, urb->transfer_buffer,
                                urb->actual_length);
-                vb2_set_plane_payload(&fbuf->vb, 0, len);
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
-                v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&fbuf->vb.timestamp);
-                fbuf->vb.v4l2_buf.sequence = dev->sequence++;
+                fbuf->vb.sequence = dev->sequence++;
-                vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
 skip:
        usb_submit_urb(urb, GFP_ATOMIC);
@@ -464,7 +466,7 @@ static void rtl2832_sdr_cleanup_queued_bufs(struct rtl2832_sdr_dev *dev)
                buf = list_entry(dev->queued_bufs.next,
                                struct rtl2832_sdr_frame_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->queued_bufs_lock, flags);
 }
@@ -518,14 +520,15 @@ static int rtl2832_sdr_buf_prepare(struct vb2_buffer *vb)
 static void rtl2832_sdr_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct rtl2832_sdr_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
        struct rtl2832_sdr_frame_buf *buf =
-                        container_of(vb, struct rtl2832_sdr_frame_buf, vb);
+                        container_of(vbuf, struct rtl2832_sdr_frame_buf, vb);
        unsigned long flags;
        /* Check the device has not disconnected between prep and queuing */
        if (!dev->udev) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                return;
        }
diff --git a/drivers/media/pci/cobalt/cobalt-driver.h b/drivers/media/pci/cobalt/cobalt-driver.h
index c206df930669..b2f08e4a68bf 100644
--- a/drivers/media/pci/cobalt/cobalt-driver.h
+++ b/drivers/media/pci/cobalt/cobalt-driver.h
@@ -35,6 +35,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-fh.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-sg.h>
 #include "m00233_video_measure_memmap_package.h"
@@ -206,11 +207,12 @@ struct sg_dma_desc_info {
 #define COBALT_STREAM_FL_ADV_IRQ                1
 struct cobalt_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
-static inline struct cobalt_buffer *to_cobalt_buffer(struct vb2_buffer *vb2)
+static inline
+struct cobalt_buffer *to_cobalt_buffer(struct vb2_v4l2_buffer *vb2)
 {
        return container_of(vb2, struct cobalt_buffer, vb);
 }
diff --git a/drivers/media/pci/cobalt/cobalt-irq.c b/drivers/media/pci/cobalt/cobalt-irq.c
index d1f5898d11ba..3de26d0714b5 100644
--- a/drivers/media/pci/cobalt/cobalt-irq.c
+++ b/drivers/media/pci/cobalt/cobalt-irq.c
@@ -134,11 +134,12 @@ done:
                skip = true;
                s->skip_first_frames--;
        }
-        v4l2_get_timestamp(&cb->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&cb->vb.timestamp);
        /* TODO: the sequence number should be read from the FPGA so we
           also know about dropped frames. */
-        cb->vb.v4l2_buf.sequence = s->sequence++;
+        cb->vb.sequence = s->sequence++;
-        vb2_buffer_done(&cb->vb, (skip || s->unstable_frame) ?
+        vb2_buffer_done(&cb->vb.vb2_buf,
+                        (skip || s->unstable_frame) ?
                        VB2_BUF_STATE_REQUEUEING : VB2_BUF_STATE_DONE);
 }
diff --git a/drivers/media/pci/cobalt/cobalt-v4l2.c b/drivers/media/pci/cobalt/cobalt-v4l2.c
index 9756fd3e8af5..7d331a4c33a2 100644
--- a/drivers/media/pci/cobalt/cobalt-v4l2.c
+++ b/drivers/media/pci/cobalt/cobalt-v4l2.c
@@ -75,7 +75,7 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
        const size_t bytes =
                COBALT_MAX_HEIGHT * max_pages_per_line * 0x20;
        const size_t audio_bytes = ((1920 * 4) / PAGE_SIZE + 1) * 0x20;
-        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index];
+        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
        struct sg_table *sg_desc = vb2_dma_sg_plane_desc(vb, 0);
        unsigned size;
        int ret;
@@ -105,17 +105,18 @@ static int cobalt_buf_init(struct vb2_buffer *vb)
 static void cobalt_buf_cleanup(struct vb2_buffer *vb)
 {
        struct cobalt_stream *s = vb->vb2_queue->drv_priv;
-        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index];
+        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
        descriptor_list_free(desc);
 }
 static int cobalt_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cobalt_stream *s = vb->vb2_queue->drv_priv;
        vb2_set_plane_payload(vb, 0, s->stride * s->height);
-        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+        vbuf->field = V4L2_FIELD_NONE;
        return 0;
 }
@@ -128,7 +129,7 @@ static void chain_all_buffers(struct cobalt_stream *s)
        list_for_each(p, &s->bufs) {
                cb = list_entry(p, struct cobalt_buffer, list);
-                desc[i] = &s->dma_desc_info[cb->vb.v4l2_buf.index];
+                desc[i] = &s->dma_desc_info[cb->vb.vb2_buf.index];
                if (i > 0)
                        descriptor_list_chain(desc[i-1], desc[i]);
                i++;
@@ -137,10 +138,11 @@ static void chain_all_buffers(struct cobalt_stream *s)
 static void cobalt_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *q = vb->vb2_queue;
        struct cobalt_stream *s = q->drv_priv;
-        struct cobalt_buffer *cb = to_cobalt_buffer(vb);
+        struct cobalt_buffer *cb = to_cobalt_buffer(vbuf);
-        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->v4l2_buf.index];
+        struct sg_dma_desc_info *desc = &s->dma_desc_info[vb->index];
        unsigned long flags;
        /* Prepare new buffer */
@@ -284,7 +286,7 @@ static void cobalt_dma_start_streaming(struct cobalt_stream *s)
                          &vo->control);
        }
        cb = list_first_entry(&s->bufs, struct cobalt_buffer, list);
-        omni_sg_dma_start(s, &s->dma_desc_info[cb->vb.v4l2_buf.index]);
+        omni_sg_dma_start(s, &s->dma_desc_info[cb->vb.vb2_buf.index]);
        spin_unlock_irqrestore(&s->irqlock, flags);
 }
@@ -381,7 +383,7 @@ static void cobalt_dma_stop_streaming(struct cobalt_stream *s)
        spin_lock_irqsave(&s->irqlock, flags);
        list_for_each(p, &s->bufs) {
                cb = list_entry(p, struct cobalt_buffer, list);
-                desc = &s->dma_desc_info[cb->vb.v4l2_buf.index];
+                desc = &s->dma_desc_info[cb->vb.vb2_buf.index];
                /* Stop DMA after this descriptor chain */
                descriptor_list_end_of_chain(desc);
        }
@@ -416,7 +418,7 @@ static void cobalt_stop_streaming(struct vb2_queue *q)
        list_for_each_safe(p, safe, &s->bufs) {
                cb = list_entry(p, struct cobalt_buffer, list);
                list_del(&cb->list);
-                vb2_buffer_done(&cb->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&cb->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&s->irqlock, flags);
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index 63c0ee5d0bf5..316a32213eff 100644
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -1155,17 +1155,19 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
        struct cx23885_buffer *buf =
-                container_of(vb, struct cx23885_buffer, vb);
+                container_of(vbuf, struct cx23885_buffer, vb);
        return cx23885_buf_prepare(buf, &dev->ts1);
 }
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer *buf = container_of(vb,
+        struct cx23885_buffer *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_free_buffer(dev, buf);
@@ -1173,8 +1175,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer   *buf = container_of(vb,
+        struct cx23885_buffer   *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_buf_queue(&dev->ts1, buf);
@@ -1201,7 +1204,7 @@ static int cx23885_start_streaming(struct vb2_queue *q, unsigned int count)
                        struct cx23885_buffer, queue);
                list_del(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
        return ret;
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 7aee76af7a85..bc1c9602f435 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -427,12 +427,13 @@ static void cx23885_wakeup(struct cx23885_tsport *port,
        buf = list_entry(q->active.next,
                         struct cx23885_buffer, queue);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.sequence = q->count++;
+        buf->vb.sequence = q->count++;
-        dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index,
+        dprintk(1, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
+                buf->vb.vb2_buf.index,
                count, q->count);
        list_del(&buf->queue);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 }
 int cx23885_sram_channel_setup(struct cx23885_dev *dev,
@@ -1453,12 +1454,12 @@ int cx23885_buf_prepare(struct cx23885_buffer *buf, struct cx23885_tsport *port)
 {
        struct cx23885_dev *dev = port->dev;
        int size = port->ts_packet_size * port->ts_packet_count;
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb.vb2_buf, 0);
        dprintk(1, "%s: %p\n", __func__, buf);
-        if (vb2_plane_size(&buf->vb, 0) < size)
+        if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
                return -EINVAL;
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
        cx23885_risc_databuffer(dev->pci, &buf->risc,
                                sgt->sgl,
@@ -1503,7 +1504,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
        if (list_empty(&cx88q->active)) {
                list_add_tail(&buf->queue, &cx88q->active);
                dprintk(1, "[%p/%d] %s - first active\n",
-                        buf, buf->vb.v4l2_buf.index, __func__);
+                        buf, buf->vb.vb2_buf.index, __func__);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
                prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
@@ -1511,7 +1512,7 @@ void cx23885_buf_queue(struct cx23885_tsport *port, struct cx23885_buffer *buf)
                list_add_tail(&buf->queue, &cx88q->active);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk(1, "[%p/%d] %s - append to active\n",
-                         buf, buf->vb.v4l2_buf.index, __func__);
+                         buf, buf->vb.vb2_buf.index, __func__);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
@@ -1530,9 +1531,10 @@ static void do_cancel_buffers(struct cx23885_tsport *port, char *reason)
                buf = list_entry(q->active.next, struct cx23885_buffer,
                                 queue);
                list_del(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                dprintk(1, "[%p/%d] %s - dma=0x%08lx\n",
-                        buf, buf->vb.v4l2_buf.index, reason, (unsigned long)buf->risc.dma);
+                        buf, buf->vb.vb2_buf.index, reason,
+                        (unsigned long)buf->risc.dma);
        }
        spin_unlock_irqrestore(&port->slock, flags);
 }
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 6e8c24cdb2cd..09ad51280295 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -110,18 +110,20 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
        struct cx23885_buffer *buf =
-                container_of(vb, struct cx23885_buffer, vb);
+                container_of(vbuf, struct cx23885_buffer, vb);
        return cx23885_buf_prepare(buf, port);
 }
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
        struct cx23885_dev *dev = port->dev;
-        struct cx23885_buffer *buf = container_of(vb,
+        struct cx23885_buffer *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_free_buffer(dev, buf);
@@ -129,8 +131,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_tsport *port = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer   *buf = container_of(vb,
+        struct cx23885_buffer   *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_buf_queue(port, buf);
diff --git a/drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/pci/cx23885/cx23885-vbi.c
index d362d3838c84..6c9bb0316aba 100644
--- a/drivers/media/pci/cx23885/cx23885-vbi.c
+++ b/drivers/media/pci/cx23885/cx23885-vbi.c
@@ -138,8 +138,9 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer *buf = container_of(vb,
+        struct cx23885_buffer *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        unsigned lines = VBI_PAL_LINE_COUNT;
@@ -161,7 +162,8 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_finish(struct vb2_buffer *vb)
 {
-        struct cx23885_buffer *buf = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct cx23885_buffer *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
@@ -190,8 +192,10 @@ static void buffer_finish(struct vb2_buffer *vb)
 */
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer *buf = container_of(vb, struct cx23885_buffer, vb);
+        struct cx23885_buffer *buf = container_of(vbuf,
+                        struct cx23885_buffer, vb);
        struct cx23885_buffer *prev;
        struct cx23885_dmaqueue *q = &dev->vbiq;
        unsigned long flags;
@@ -206,7 +210,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                list_add_tail(&buf->queue, &q->active);
                spin_unlock_irqrestore(&dev->slock, flags);
                dprintk(2, "[%p/%d] vbi_queue - first active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@@ -217,7 +221,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                spin_unlock_irqrestore(&dev->slock, flags);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk(2, "[%p/%d] buffer_queue - append to active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        }
 }
@@ -245,7 +249,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
                        struct cx23885_buffer, queue);
                list_del(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index ec76470d12a4..b6a193df618a 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -104,12 +104,12 @@ void cx23885_video_wakeup(struct cx23885_dev *dev,
        buf = list_entry(q->active.next,
                        struct cx23885_buffer, queue);
-        buf->vb.v4l2_buf.sequence = q->count++;
+        buf->vb.sequence = q->count++;
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf, buf->vb.v4l2_buf.index,
+        dprintk(2, "[%p/%d] wakeup reg=%d buf=%d\n", buf,
-                        count, q->count);
+                        buf->vb.vb2_buf.index, count, q->count);
        list_del(&buf->queue);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 }
 int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
@@ -329,9 +329,10 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
        struct cx23885_buffer *buf =
-                container_of(vb, struct cx23885_buffer, vb);
+                container_of(vbuf, struct cx23885_buffer, vb);
        u32 line0_offset, line1_offset;
        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        int field_tff;
@@ -401,7 +402,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
                BUG();
        }
        dprintk(2, "[%p/%d] buffer_init - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
-                buf, buf->vb.v4l2_buf.index,
+                buf, buf->vb.vb2_buf.index,
                dev->width, dev->height, dev->fmt->depth, dev->fmt->name,
                (unsigned long)buf->risc.dma);
        return 0;
@@ -409,7 +410,8 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_finish(struct vb2_buffer *vb)
 {
-        struct cx23885_buffer *buf = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct cx23885_buffer *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
@@ -438,8 +440,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 */
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx23885_buffer   *buf = container_of(vb,
+        struct cx23885_buffer   *buf = container_of(vbuf,
                struct cx23885_buffer, vb);
        struct cx23885_buffer   *prev;
        struct cx23885_dmaqueue *q    = &dev->vidq;
@@ -455,7 +458,7 @@ static void buffer_queue(struct vb2_buffer *vb)
        if (list_empty(&q->active)) {
                list_add_tail(&buf->queue, &q->active);
                dprintk(2, "[%p/%d] buffer_queue - first active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
                prev = list_entry(q->active.prev, struct cx23885_buffer,
@@ -463,7 +466,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                list_add_tail(&buf->queue, &q->active);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk(2, "[%p/%d] buffer_queue - append to active\n",
-                                buf, buf->vb.v4l2_buf.index);
+                                buf, buf->vb.vb2_buf.index);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
@@ -492,7 +495,7 @@ static void cx23885_stop_streaming(struct vb2_queue *q)
                        struct cx23885_buffer, queue);
                list_del(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 027ead438194..c5ba0833f47a 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -170,7 +170,7 @@ struct cx23885_riscmem {
 /* buffer for one video frame */
 struct cx23885_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head queue;
        /* cx23885 specific */
diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
index 7bc495e4ece2..f1deb8fd271c 100644
--- a/drivers/media/pci/cx25821/cx25821-video.c
+++ b/drivers/media/pci/cx25821/cx25821-video.c
@@ -130,10 +130,10 @@ int cx25821_video_irq(struct cx25821_dev *dev, int chan_num, u32 status)
                        buf = list_entry(dmaq->active.next,
                                         struct cx25821_buffer, queue);
-                        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                        v4l2_get_timestamp(&buf->vb.timestamp);
-                        buf->vb.v4l2_buf.sequence = dmaq->count++;
+                        buf->vb.sequence = dmaq->count++;
                        list_del(&buf->queue);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                }
                spin_unlock(&dev->slock);
                handled++;
@@ -159,10 +159,11 @@ static int cx25821_queue_setup(struct vb2_queue *q, const struct v4l2_format *fm
 static int cx25821_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
        struct cx25821_dev *dev = chan->dev;
        struct cx25821_buffer *buf =
-                container_of(vb, struct cx25821_buffer, vb);
+                container_of(vbuf, struct cx25821_buffer, vb);
        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        u32 line0_offset;
        int bpl_local = LINE_SIZE_D1;
@@ -176,7 +177,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
        if (vb2_plane_size(vb, 0) < chan->height * buf->bpl)
                return -EINVAL;
        vb2_set_plane_payload(vb, 0, chan->height * buf->bpl);
-        buf->vb.v4l2_buf.field = chan->field;
+        buf->vb.field = chan->field;
        if (chan->pixel_formats == PIXEL_FRMT_411) {
                bpl_local = buf->bpl;
@@ -231,7 +232,7 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
        }
        dprintk(2, "[%p/%d] buffer_prep - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
-                buf, buf->vb.v4l2_buf.index, chan->width, chan->height,
+                buf, buf->vb.vb2_buf.index, chan->width, chan->height,
                chan->fmt->depth, chan->fmt->name,
                (unsigned long)buf->risc.dma);
@@ -240,8 +241,9 @@ static int cx25821_buffer_prepare(struct vb2_buffer *vb)
 static void cx25821_buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx25821_buffer *buf =
-                container_of(vb, struct cx25821_buffer, vb);
+                container_of(vbuf, struct cx25821_buffer, vb);
        struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
        struct cx25821_dev *dev = chan->dev;
@@ -250,8 +252,9 @@ static void cx25821_buffer_finish(struct vb2_buffer *vb)
 static void cx25821_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx25821_buffer *buf =
-                container_of(vb, struct cx25821_buffer, vb);
+                container_of(vbuf, struct cx25821_buffer, vb);
        struct cx25821_channel *chan = vb->vb2_queue->drv_priv;
        struct cx25821_dev *dev = chan->dev;
        struct cx25821_buffer *prev;
@@ -300,7 +303,7 @@ static void cx25821_stop_streaming(struct vb2_queue *q)
                        struct cx25821_buffer, queue);
                list_del(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx25821/cx25821.h b/drivers/media/pci/cx25821/cx25821.h
index d81a08a2df4f..a513b68be0fa 100644
--- a/drivers/media/pci/cx25821/cx25821.h
+++ b/drivers/media/pci/cx25821/cx25821.h
@@ -34,6 +34,7 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-sg.h>
 #include "cx25821-reg.h"
@@ -127,7 +128,7 @@ struct cx25821_riscmem {
 /* buffer for one video frame */
 struct cx25821_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head queue;
        /* cx25821 specific */
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 24216efa56e7..49d0b7c5271b 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -653,16 +653,18 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
 }
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_riscmem *risc = &buf->risc;
        if (risc->cpu)
@@ -672,8 +674,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer    *buf = container_of(vbuf, struct cx88_buffer, vb);
        cx8802_buf_queue(dev, buf);
 }
@@ -721,7 +724,7 @@ fail:
                        struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
        return err;
@@ -749,7 +752,7 @@ static void stop_streaming(struct vb2_queue *q)
                        struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index aab7cf4c9825..9a43c7826b60 100644
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -518,11 +518,11 @@ void cx88_wakeup(struct cx88_core *core,
        buf = list_entry(q->active.next,
                         struct cx88_buffer, list);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.field = core->field;
+        buf->vb.field = core->field;
-        buf->vb.v4l2_buf.sequence = q->count++;
+        buf->vb.sequence = q->count++;
        list_del(&buf->list);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 }
 void cx88_shutdown(struct cx88_core *core)
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 9dfa5ee32a8f..f0923fb5a35d 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -99,16 +99,18 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
 }
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_riscmem *risc = &buf->risc;
        if (risc->cpu)
@@ -118,8 +120,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer    *buf = container_of(vbuf, struct cx88_buffer, vb);
        cx8802_buf_queue(dev, buf);
 }
@@ -149,7 +152,7 @@ static void stop_streaming(struct vb2_queue *q)
                        struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 34f505744477..9961b2232b97 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -214,7 +214,7 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
        buf = list_entry(q->active.next, struct cx88_buffer, list);
        dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                buf, buf->vb.v4l2_buf.index);
+                buf, buf->vb.vb2_buf.index);
        cx8802_start_dma(dev, q, buf);
        return 0;
 }
@@ -225,13 +225,13 @@ int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
                        struct cx88_buffer *buf)
 {
        int size = dev->ts_packet_size * dev->ts_packet_count;
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb.vb2_buf, 0);
        struct cx88_riscmem *risc = &buf->risc;
        int rc;
-        if (vb2_plane_size(&buf->vb, 0) < size)
+        if (vb2_plane_size(&buf->vb.vb2_buf, 0) < size)
                return -EINVAL;
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
        rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl,
                             dev->ts_packet_size, dev->ts_packet_count, 0);
@@ -259,7 +259,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                dprintk( 1, "queue is empty - first active\n" );
                list_add_tail(&buf->list, &cx88q->active);
                dprintk(1,"[%p/%d] %s - first active\n",
-                        buf, buf->vb.v4l2_buf.index, __func__);
+                        buf, buf->vb.vb2_buf.index, __func__);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@@ -268,7 +268,7 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
                list_add_tail(&buf->list, &cx88q->active);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk( 1, "[%p/%d] %s - append to active\n",
-                        buf, buf->vb.v4l2_buf.index, __func__);
+                        buf, buf->vb.vb2_buf.index, __func__);
        }
 }
@@ -284,7 +284,7 @@ static void do_cancel_buffers(struct cx8802_dev *dev)
        while (!list_empty(&q->active)) {
                buf = list_entry(q->active.next, struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock,flags);
 }
diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c
index 7510e80eb2ff..1d65543003b4 100644
--- a/drivers/media/pci/cx88/cx88-vbi.c
+++ b/drivers/media/pci/cx88/cx88-vbi.c
@@ -100,7 +100,7 @@ int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
        buf = list_entry(q->active.next, struct cx88_buffer, list);
        dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                buf, buf->vb.v4l2_buf.index);
+                buf, buf->vb.vb2_buf.index);
        cx8800_start_vbi_dma(dev, q, buf);
        return 0;
 }
@@ -125,8 +125,9 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        unsigned int lines;
        unsigned int size;
@@ -149,8 +150,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_riscmem *risc = &buf->risc;
        if (risc->cpu)
@@ -160,8 +162,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer    *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_buffer    *prev;
        struct cx88_dmaqueue  *q    = &dev->vbiq;
@@ -174,7 +177,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                list_add_tail(&buf->list, &q->active);
                cx8800_start_vbi_dma(dev, q, buf);
                dprintk(2,"[%p/%d] vbi_queue - first active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@@ -182,7 +185,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                list_add_tail(&buf->list, &q->active);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk(2,"[%p/%d] buffer_queue - append to active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        }
 }
@@ -213,7 +216,7 @@ static void stop_streaming(struct vb2_queue *q)
                        struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 400e5caefd58..c6a337abdbb3 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -420,7 +420,7 @@ static int restart_video_queue(struct cx8800_dev    *dev,
        if (!list_empty(&q->active)) {
                buf = list_entry(q->active.next, struct cx88_buffer, list);
                dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
                start_video_dma(dev, q, buf);
        }
        return 0;
@@ -444,9 +444,10 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
        struct cx88_core *core = dev->core;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        buf->bpl = core->width * dev->fmt->depth >> 3;
@@ -489,7 +490,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
                break;
        }
        dprintk(2,"[%p/%d] buffer_prepare - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
-                buf, buf->vb.v4l2_buf.index,
+                buf, buf->vb.vb2_buf.index,
                core->width, core->height, dev->fmt->depth, dev->fmt->name,
                (unsigned long)buf->risc.dma);
        return 0;
@@ -497,8 +498,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_riscmem *risc = &buf->risc;
        if (risc->cpu)
@@ -508,8 +510,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
-        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+        struct cx88_buffer    *buf = container_of(vbuf, struct cx88_buffer, vb);
        struct cx88_buffer    *prev;
        struct cx88_core      *core = dev->core;
        struct cx88_dmaqueue  *q    = &dev->vidq;
@@ -522,7 +525,7 @@ static void buffer_queue(struct vb2_buffer *vb)
        if (list_empty(&q->active)) {
                list_add_tail(&buf->list, &q->active);
                dprintk(2,"[%p/%d] buffer_queue - first active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        } else {
                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
@@ -530,7 +533,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                list_add_tail(&buf->list, &q->active);
                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                dprintk(2, "[%p/%d] buffer_queue - append to active\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        }
 }
@@ -560,7 +563,7 @@ static void stop_streaming(struct vb2_queue *q)
                        struct cx88_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index 785fe2e0d702..2996eb3ea1fc 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -321,7 +321,7 @@ struct cx88_riscmem {
 /* buffer for one video frame */
 struct cx88_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head       list;
        /* cx88 specific */
diff --git a/drivers/media/pci/dt3155/dt3155.c b/drivers/media/pci/dt3155/dt3155.c
index 8df634518927..f27a8582d179 100644
--- a/drivers/media/pci/dt3155/dt3155.c
+++ b/drivers/media/pci/dt3155/dt3155.c
@@ -160,7 +160,7 @@ static int dt3155_buf_prepare(struct vb2_buffer *vb)
 static int dt3155_start_streaming(struct vb2_queue *q, unsigned count)
 {
        struct dt3155_priv *pd = vb2_get_drv_priv(q);
-        struct vb2_buffer *vb = pd->curr_buf;
+        struct vb2_buffer *vb = &pd->curr_buf->vb2_buf;
        dma_addr_t dma_addr;
        pd->sequence = 0;
@@ -208,7 +208,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
        spin_lock_irq(&pd->lock);
        if (pd->curr_buf) {
-                vb2_buffer_done(pd->curr_buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&pd->curr_buf->vb2_buf, VB2_BUF_STATE_ERROR);
                pd->curr_buf = NULL;
        }
@@ -222,6 +222,7 @@ static void dt3155_stop_streaming(struct vb2_queue *q)
 static void dt3155_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct dt3155_priv *pd = vb2_get_drv_priv(vb->vb2_queue);
        /*  pd->vidq.streaming = 1 when dt3155_buf_queue() is invoked  */
@@ -229,7 +230,7 @@ static void dt3155_buf_queue(struct vb2_buffer *vb)
        if (pd->curr_buf)
                list_add_tail(&vb->done_entry, &pd->dmaq);
        else
-                pd->curr_buf = vb;
+                pd->curr_buf = vbuf;
        spin_unlock_irq(&pd->lock);
 }
@@ -269,14 +270,14 @@ static irqreturn_t dt3155_irq_handler_even(int irq, void *dev_id)
        spin_lock(&ipd->lock);
        if (ipd->curr_buf && !list_empty(&ipd->dmaq)) {
-                v4l2_get_timestamp(&ipd->curr_buf->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&ipd->curr_buf->timestamp);
-                ipd->curr_buf->v4l2_buf.sequence = ipd->sequence++;
+                ipd->curr_buf->sequence = ipd->sequence++;
-                ipd->curr_buf->v4l2_buf.field = V4L2_FIELD_NONE;
+                ipd->curr_buf->field = V4L2_FIELD_NONE;
-                vb2_buffer_done(ipd->curr_buf, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&ipd->curr_buf->vb2_buf, VB2_BUF_STATE_DONE);
                ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
                list_del(&ivb->done_entry);
-                ipd->curr_buf = ivb;
+                ipd->curr_buf = to_vb2_v4l2_buffer(ivb);
                dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
                iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
                iowrite32(dma_addr + ipd->width, ipd->regs + ODD_DMA_START);
diff --git a/drivers/media/pci/dt3155/dt3155.h b/drivers/media/pci/dt3155/dt3155.h
index 4e1f4d598d57..b3531e0bc733 100644
--- a/drivers/media/pci/dt3155/dt3155.h
+++ b/drivers/media/pci/dt3155/dt3155.h
@@ -22,6 +22,7 @@
 #include <linux/interrupt.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-dev.h>
+#include <media/videobuf2-v4l2.h>
 #define DT3155_NAME "dt3155"
 #define DT3155_VER_MAJ 2
@@ -181,7 +182,7 @@ struct dt3155_priv {
        struct pci_dev *pdev;
        struct vb2_queue vidq;
        struct vb2_alloc_ctx *alloc_ctx;
-        struct vb2_buffer *curr_buf;
+        struct vb2_v4l2_buffer *curr_buf;
        struct mutex mux;
        struct list_head dmaq;
        spinlock_t lock;
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 6d8bf6277647..b012aa658a54 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/list.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include "netup_unidvb.h"
@@ -110,7 +111,7 @@ struct netup_dma_regs {
 } __packed __aligned(1);
 struct netup_unidvb_buffer {
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head        list;
        u32                     size;
 };
@@ -300,7 +301,8 @@ static int netup_unidvb_queue_setup(struct vb2_queue *vq,
 static int netup_unidvb_buf_prepare(struct vb2_buffer *vb)
 {
        struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
-        struct netup_unidvb_buffer *buf = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct netup_unidvb_buffer *buf = container_of(vbuf,
                                struct netup_unidvb_buffer, vb);
        dev_dbg(&dma->ndev->pci_dev->dev, "%s(): buf 0x%p\n", __func__, buf);
@@ -312,7 +314,8 @@ static void netup_unidvb_buf_queue(struct vb2_buffer *vb)
 {
        unsigned long flags;
        struct netup_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
-        struct netup_unidvb_buffer *buf = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct netup_unidvb_buffer *buf = container_of(vbuf,
                                struct netup_unidvb_buffer, vb);
        dev_dbg(&dma->ndev->pci_dev->dev, "%s(): %p\n", __func__, buf);
@@ -509,7 +512,7 @@ static int netup_unidvb_ring_copy(struct netup_dma *dma,
 {
        u32 copy_bytes, ring_bytes;
        u32 buff_bytes = NETUP_DMA_PACKETS_COUNT * 188 - buf->size;
-        u8 *p = vb2_plane_vaddr(&buf->vb, 0);
+        u8 *p = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        struct netup_unidvb_dev *ndev = dma->ndev;
        if (p == NULL) {
@@ -579,9 +582,9 @@ static void netup_unidvb_dma_worker(struct work_struct *work)
                        dev_dbg(&ndev->pci_dev->dev,
                                "%s(): buffer %p done, size %d\n",
                                __func__, buf, buf->size);
-                        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                        v4l2_get_timestamp(&buf->vb.timestamp);
-                        vb2_set_plane_payload(&buf->vb, 0, buf->size);
+                        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->size);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                }
        }
 work_done:
@@ -599,7 +602,7 @@ static void netup_unidvb_queue_cleanup(struct netup_dma *dma)
                buf = list_first_entry(&dma->free_buffers,
                        struct netup_unidvb_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dma->lock, flags);
 }
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 72d7f992375e..87f39f97a79f 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -216,13 +216,14 @@ int saa7134_buffer_count(unsigned int size, unsigned int count)
 int saa7134_buffer_startpage(struct saa7134_buf *buf)
 {
-        return saa7134_buffer_pages(vb2_plane_size(&buf->vb2, 0)) * buf->vb2.v4l2_buf.index;
+        return saa7134_buffer_pages(vb2_plane_size(&buf->vb2.vb2_buf, 0))
+                        * buf->vb2.vb2_buf.index;
 }
 unsigned long saa7134_buffer_base(struct saa7134_buf *buf)
 {
        unsigned long base;
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
+        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2.vb2_buf, 0);
        base  = saa7134_buffer_startpage(buf) * 4096;
        base += dma->sgl[0].offset;
@@ -308,9 +309,9 @@ void saa7134_buffer_finish(struct saa7134_dev *dev,
        core_dbg("buffer_finish %p\n", q->curr);
        /* finish current buffer */
-        v4l2_get_timestamp(&q->curr->vb2.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&q->curr->vb2.timestamp);
-        q->curr->vb2.v4l2_buf.sequence = q->seq_nr++;
+        q->curr->vb2.sequence = q->seq_nr++;
-        vb2_buffer_done(&q->curr->vb2, state);
+        vb2_buffer_done(&q->curr->vb2.vb2_buf, state);
        q->curr = NULL;
 }
@@ -375,7 +376,8 @@ void saa7134_stop_streaming(struct saa7134_dev *dev, struct saa7134_dmaqueue *q)
        if (!list_empty(&q->queue)) {
                list_for_each_safe(pos, n, &q->queue) {
                         tmp = list_entry(pos, struct saa7134_buf, entry);
-                         vb2_buffer_done(&tmp->vb2, VB2_BUF_STATE_ERROR);
+                         vb2_buffer_done(&tmp->vb2.vb2_buf,
+                                         VB2_BUF_STATE_ERROR);
                         list_del(pos);
                         tmp = NULL;
                }
diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 4b202fa5fbc4..b0ef37dc770a 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -79,8 +79,9 @@ static int buffer_activate(struct saa7134_dev *dev,
 int saa7134_ts_buffer_init(struct vb2_buffer *vb2)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
        dmaq->curr = NULL;
        buf->activate = buffer_activate;
@@ -91,9 +92,10 @@ EXPORT_SYMBOL_GPL(saa7134_ts_buffer_init);
 int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
        struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
        unsigned int lines, llength, size;
@@ -107,7 +109,7 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
                return -EINVAL;
        vb2_set_plane_payload(vb2, 0, size);
-        vb2->v4l2_buf.field = dev->field;
+        vbuf->field = dev->field;
        return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                    saa7134_buffer_startpage(buf));
@@ -148,10 +150,12 @@ int saa7134_ts_start_streaming(struct vb2_queue *vq, unsigned int count)
                list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) {
                        list_del(&buf->entry);
-                        vb2_buffer_done(&buf->vb2, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb2.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
                if (dmaq->curr) {
-                        vb2_buffer_done(&dmaq->curr->vb2, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&dmaq->curr->vb2.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                        dmaq->curr = NULL;
                }
                return -EBUSY;
diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index 4d36586ad752..fb1605e25e52 100644
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -83,7 +83,7 @@ static int buffer_activate(struct saa7134_dev *dev,
                           struct saa7134_buf *buf,
                           struct saa7134_buf *next)
 {
-        struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_queue->drv_priv;
+        struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
        unsigned long control, base;
        vbi_dbg("buffer_activate [%p]\n", buf);
@@ -119,8 +119,9 @@ static int buffer_prepare(struct vb2_buffer *vb2)
 {
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
+        struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
        unsigned int size;
        if (dma->sgl->offset) {
@@ -161,7 +162,8 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 static int buffer_init(struct vb2_buffer *vb2)
 {
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
        dmaq->curr = NULL;
        buf->activate = buffer_activate;
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 035039cfae6d..602d53d6122c 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -791,7 +791,7 @@ static int buffer_activate(struct saa7134_dev *dev,
                           struct saa7134_buf *buf,
                           struct saa7134_buf *next)
 {
-        struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_queue->drv_priv;
+        struct saa7134_dmaqueue *dmaq = buf->vb2.vb2_buf.vb2_queue->drv_priv;
        unsigned long base,control,bpl;
        unsigned long bpl_uv,lines_uv,base2,base3,tmp; /* planar */
@@ -872,7 +872,8 @@ static int buffer_activate(struct saa7134_dev *dev,
 static int buffer_init(struct vb2_buffer *vb2)
 {
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
        dmaq->curr = NULL;
        buf->activate = buffer_activate;
@@ -883,8 +884,9 @@ static int buffer_prepare(struct vb2_buffer *vb2)
 {
        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
+        struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
        unsigned int size;
        if (dma->sgl->offset) {
@@ -896,7 +898,7 @@ static int buffer_prepare(struct vb2_buffer *vb2)
                return -EINVAL;
        vb2_set_plane_payload(vb2, 0, size);
-        vb2->v4l2_buf.field = dev->field;
+        vbuf->field = dev->field;
        return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                    saa7134_buffer_startpage(buf));
@@ -932,7 +934,8 @@ void saa7134_vb2_buffer_queue(struct vb2_buffer *vb)
 {
        struct saa7134_dmaqueue *dmaq = vb->vb2_queue->drv_priv;
        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb, struct saa7134_buf, vb2);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct saa7134_buf *buf = container_of(vbuf, struct saa7134_buf, vb2);
        saa7134_buffer_queue(dev, dmaq, buf);
 }
@@ -953,10 +956,12 @@ int saa7134_vb2_start_streaming(struct vb2_queue *vq, unsigned int count)
                list_for_each_entry_safe(buf, tmp, &dmaq->queue, entry) {
                        list_del(&buf->entry);
-                        vb2_buffer_done(&buf->vb2, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb2.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
                if (dmaq->curr) {
-                        vb2_buffer_done(&dmaq->curr->vb2, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&dmaq->curr->vb2.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                        dmaq->curr = NULL;
                }
                return -EBUSY;
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 14c2b4e0ee40..fea0514dfa4a 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -460,7 +460,7 @@ struct saa7134_thread {
 /* buffer for one video/vbi/ts frame */
 struct saa7134_buf {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb2;
+        struct vb2_v4l2_buffer vb2;
        /* saa7134 specific */
        unsigned int            top_seen;
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 53fff5425c13..78ac3fe22b45 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -458,11 +458,12 @@ static inline u32 vop_usec(const vop_header *vh)
 static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
                          struct vb2_buffer *vb, const vop_header *vh)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct solo_dev *solo_dev = solo_enc->solo_dev;
-        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        int frame_size;
-        vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+        vbuf->flags |= V4L2_BUF_FLAG_KEYFRAME;
        if (vb2_plane_size(vb, 0) < vop_jpeg_size(vh) + solo_enc->jpeg_len)
                return -EIO;
@@ -470,7 +471,7 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
        frame_size = ALIGN(vop_jpeg_size(vh) + solo_enc->jpeg_len, DMA_ALIGN);
        vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len);
-        return solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
+        return solo_send_desc(solo_enc, solo_enc->jpeg_len, sgt,
                             vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev),
                             frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
                             SOLO_JPEG_EXT_SIZE(solo_dev));
@@ -479,8 +480,9 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
 static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
                struct vb2_buffer *vb, const vop_header *vh)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct solo_dev *solo_dev = solo_enc->solo_dev;
-        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        int frame_off, frame_size;
        int skip = 0;
@@ -488,15 +490,15 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
                return -EIO;
        /* If this is a key frame, add extra header */
-        vb->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME |
+        vbuf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_PFRAME |
                V4L2_BUF_FLAG_BFRAME);
        if (!vop_type(vh)) {
                skip = solo_enc->vop_len;
-                vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+                vbuf->flags |= V4L2_BUF_FLAG_KEYFRAME;
                vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh) +
                        solo_enc->vop_len);
        } else {
-                vb->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME;
+                vbuf->flags |= V4L2_BUF_FLAG_PFRAME;
                vb2_set_plane_payload(vb, 0, vop_mpeg_size(vh));
        }
@@ -505,7 +507,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
                sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
        frame_size = ALIGN(vop_mpeg_size(vh) + skip, DMA_ALIGN);
-        return solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
+        return solo_send_desc(solo_enc, skip, sgt, frame_off, frame_size,
                        SOLO_MP4E_EXT_ADDR(solo_dev),
                        SOLO_MP4E_EXT_SIZE(solo_dev));
 }
@@ -513,6 +515,7 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
 static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
                            struct vb2_buffer *vb, struct solo_enc_buf *enc_buf)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        const vop_header *vh = enc_buf->vh;
        int ret;
@@ -527,17 +530,18 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
        }
        if (!ret) {
-                vb->v4l2_buf.sequence = solo_enc->sequence++;
+                vbuf->sequence = solo_enc->sequence++;
-                vb->v4l2_buf.timestamp.tv_sec = vop_sec(vh);
+                vbuf->timestamp.tv_sec = vop_sec(vh);
-                vb->v4l2_buf.timestamp.tv_usec = vop_usec(vh);
+                vbuf->timestamp.tv_usec = vop_usec(vh);
                /* Check for motion flags */
                if (solo_is_motion_on(solo_enc) && enc_buf->motion) {
                        struct v4l2_event ev = {
                                .type = V4L2_EVENT_MOTION_DET,
                                .u.motion_det = {
-                                        .flags = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
+                                        .flags
-                                        .frame_sequence = vb->v4l2_buf.sequence,
+                                        = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
+                                        .frame_sequence = vbuf->sequence,
                                        .region_mask = enc_buf->motion ? 1 : 0,
                                },
                        };
@@ -571,7 +575,7 @@ static void solo_enc_handle_one(struct solo_enc_dev *solo_enc,
        list_del(&vb->list);
        spin_unlock_irqrestore(&solo_enc->av_lock, flags);
-        solo_enc_fillbuf(solo_enc, &vb->vb, enc_buf);
+        solo_enc_fillbuf(solo_enc, &vb->vb.vb2_buf, enc_buf);
 unlock:
        mutex_unlock(&solo_enc->lock);
 }
@@ -678,10 +682,11 @@ static int solo_enc_queue_setup(struct vb2_queue *q,
 static void solo_enc_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vq);
        struct solo_vb2_buf *solo_vb =
-                container_of(vb, struct solo_vb2_buf, vb);
+                container_of(vbuf, struct solo_vb2_buf, vb);
        spin_lock(&solo_enc->av_lock);
        list_add_tail(&solo_vb->list, &solo_enc->vidq_active);
@@ -734,25 +739,26 @@ static void solo_enc_stop_streaming(struct vb2_queue *q)
                                struct solo_vb2_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&solo_enc->av_lock, flags);
 }
 static void solo_enc_buf_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vb->vb2_queue);
-        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
        switch (solo_enc->fmt) {
        case V4L2_PIX_FMT_MPEG4:
        case V4L2_PIX_FMT_H264:
-                if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME)
+                if (vbuf->flags & V4L2_BUF_FLAG_KEYFRAME)
-                        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                        sg_copy_from_buffer(sgt->sgl, sgt->nents,
                                        solo_enc->vop, solo_enc->vop_len);
                break;
        default: /* V4L2_PIX_FMT_MJPEG */
-                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                sg_copy_from_buffer(sgt->sgl, sgt->nents,
                                solo_enc->jpeg_header, solo_enc->jpeg_len);
                break;
        }
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2.c b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
index 63ae8a61f603..57d0d9cf190e 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2.c
@@ -26,6 +26,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 #include "solo6x10.h"
@@ -191,13 +192,14 @@ static int solo_v4l2_set_ch(struct solo_dev *solo_dev, u8 ch)
 static void solo_fillbuf(struct solo_dev *solo_dev,
                         struct vb2_buffer *vb)
 {
-        dma_addr_t vbuf;
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        dma_addr_t addr;
        unsigned int fdma_addr;
        int error = -1;
        int i;
-        vbuf = vb2_dma_contig_plane_dma_addr(vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(vb, 0);
-        if (!vbuf)
+        if (!addr)
                goto finish_buf;
        if (erase_off(solo_dev)) {
@@ -213,7 +215,7 @@ static void solo_fillbuf(struct solo_dev *solo_dev,
                fdma_addr = SOLO_DISP_EXT_ADDR + (solo_dev->old_write *
                                (SOLO_HW_BPL * solo_vlines(solo_dev)));
-                error = solo_p2m_dma_t(solo_dev, 0, vbuf, fdma_addr,
+                error = solo_p2m_dma_t(solo_dev, 0, addr, fdma_addr,
                                       solo_bytesperline(solo_dev),
                                       solo_vlines(solo_dev), SOLO_HW_BPL);
        }
@@ -222,8 +224,8 @@ finish_buf:
        if (!error) {
                vb2_set_plane_payload(vb, 0,
                        solo_vlines(solo_dev) * solo_bytesperline(solo_dev));
-                vb->v4l2_buf.sequence = solo_dev->sequence++;
+                vbuf->sequence = solo_dev->sequence++;
-                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbuf->timestamp);
        }
        vb2_buffer_done(vb, error ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
@@ -256,7 +258,7 @@ static void solo_thread_try(struct solo_dev *solo_dev)
                spin_unlock(&solo_dev->slock);
-                solo_fillbuf(solo_dev, &vb->vb);
+                solo_fillbuf(solo_dev, &vb->vb.vb2_buf);
        }
        assert_spin_locked(&solo_dev->slock);
@@ -345,10 +347,11 @@ static void solo_stop_streaming(struct vb2_queue *q)
 static void solo_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct solo_dev *solo_dev = vb2_get_drv_priv(vq);
        struct solo_vb2_buf *solo_vb =
-                container_of(vb, struct solo_vb2_buf, vb);
+                container_of(vbuf, struct solo_vb2_buf, vb);
        spin_lock(&solo_dev->slock);
        list_add_tail(&solo_vb->list, &solo_dev->vidq_active);
diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
index 5cc9e9dc61e4..4ab6586c0467 100644
--- a/drivers/media/pci/solo6x10/solo6x10.h
+++ b/drivers/media/pci/solo6x10/solo6x10.h
@@ -135,7 +135,7 @@ struct solo_p2m_dev {
 #define OSD_TEXT_MAX            44
 struct solo_vb2_buf {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
index 59b3a36a3639..fc99f33d65e9 100644
--- a/drivers/media/pci/sta2x11/sta2x11_vip.c
+++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
@@ -88,11 +88,11 @@
 struct vip_buffer {
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head        list;
        dma_addr_t              dma;
 };
-static inline struct vip_buffer *to_vip_buffer(struct vb2_buffer *vb2)
+static inline struct vip_buffer *to_vip_buffer(struct vb2_v4l2_buffer *vb2)
 {
        return container_of(vb2, struct vip_buffer, vb);
 }
@@ -287,7 +287,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 };
 static int buffer_init(struct vb2_buffer *vb)
 {
-        struct vip_buffer *vip_buf = to_vip_buffer(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
        vip_buf->dma = vb2_dma_contig_plane_dma_addr(vb, 0);
        INIT_LIST_HEAD(&vip_buf->list);
@@ -296,8 +297,9 @@ static int buffer_init(struct vb2_buffer *vb)
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
-        struct vip_buffer *vip_buf = to_vip_buffer(vb);
+        struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
        unsigned long size;
        size = vip->format.sizeimage;
@@ -307,14 +309,15 @@ static int buffer_prepare(struct vb2_buffer *vb)
                return -EINVAL;
        }
-        vb2_set_plane_payload(&vip_buf->vb, 0, size);
+        vb2_set_plane_payload(&vip_buf->vb.vb2_buf, 0, size);
        return 0;
 }
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
-        struct vip_buffer *vip_buf = to_vip_buffer(vb);
+        struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
        spin_lock(&vip->lock);
        list_add_tail(&vip_buf->list, &vip->buffer_list);
@@ -329,8 +332,9 @@ static void buffer_queue(struct vb2_buffer *vb)
 }
 static void buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct sta2x11_vip *vip = vb2_get_drv_priv(vb->vb2_queue);
-        struct vip_buffer *vip_buf = to_vip_buffer(vb);
+        struct vip_buffer *vip_buf = to_vip_buffer(vbuf);
        /* Buffer handled, remove it from the list */
        spin_lock(&vip->lock);
@@ -370,7 +374,7 @@ static void stop_streaming(struct vb2_queue *vq)
        /* Release all active buffers */
        spin_lock(&vip->lock);
        list_for_each_entry_safe(vip_buf, node, &vip->buffer_list, list) {
-                vb2_buffer_done(&vip_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&vip_buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&vip_buf->list);
        }
        spin_unlock(&vip->lock);
@@ -813,9 +817,9 @@ static irqreturn_t vip_irq(int irq, struct sta2x11_vip *vip)
                /* Disable acquisition */
                reg_write(vip, DVP_CTL, reg_read(vip, DVP_CTL) & ~DVP_CTL_ENA);
                /* Remove the active buffer from the list */
-                v4l2_get_timestamp(&vip->active->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vip->active->vb.timestamp);
-                vip->active->vb.v4l2_buf.sequence = vip->sequence++;
+                vip->active->vb.sequence = vip->sequence++;
-                vb2_buffer_done(&vip->active->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&vip->active->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
        return IRQ_HANDLED;
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 8355e55b4e8e..323721439b8e 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -423,9 +423,10 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 */
 static void tw68_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct tw68_dev *dev = vb2_get_drv_priv(vq);
-        struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb);
+        struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
        struct tw68_buf *prev;
        unsigned long flags;
@@ -457,9 +458,10 @@ static void tw68_buf_queue(struct vb2_buffer *vb)
 */
 static int tw68_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct tw68_dev *dev = vb2_get_drv_priv(vq);
-        struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb);
+        struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
        struct sg_table *dma = vb2_dma_sg_plane_desc(vb, 0);
        unsigned size, bpl;
@@ -499,9 +501,10 @@ static int tw68_buf_prepare(struct vb2_buffer *vb)
 static void tw68_buf_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct tw68_dev *dev = vb2_get_drv_priv(vq);
-        struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb);
+        struct tw68_buf *buf = container_of(vbuf, struct tw68_buf, vb);
        pci_free_consistent(dev->pci, buf->size, buf->cpu, buf->dma);
 }
@@ -528,7 +531,7 @@ static void tw68_stop_streaming(struct vb2_queue *q)
                        container_of(dev->active.next, struct tw68_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
 }
@@ -1012,10 +1015,10 @@ void tw68_irq_video_done(struct tw68_dev *dev, unsigned long status)
                buf = list_entry(dev->active.next, struct tw68_buf, list);
                list_del(&buf->list);
                spin_unlock(&dev->slock);
-                v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&buf->vb.timestamp);
-                buf->vb.v4l2_buf.field = dev->field;
+                buf->vb.field = dev->field;
-                buf->vb.v4l2_buf.sequence = dev->seqnr++;
+                buf->vb.sequence = dev->seqnr++;
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                status &= ~(TW68_DMAPI);
                if (0 == status)
                        return;
diff --git a/drivers/media/pci/tw68/tw68.h b/drivers/media/pci/tw68/tw68.h
index ef51e4d48866..6c7dcb300f34 100644
--- a/drivers/media/pci/tw68/tw68.h
+++ b/drivers/media/pci/tw68/tw68.h
@@ -36,6 +36,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-device.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-sg.h>
 #include "tw68-reg.h"
@@ -118,7 +119,7 @@ struct tw68_dev;	/* forward delclaration */
 /* buffer for one video/vbi/ts frame */
 struct tw68_buf {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        unsigned int   size;
diff --git a/drivers/media/platform/am437x/am437x-vpfe.c b/drivers/media/platform/am437x/am437x-vpfe.c
index c8447fa3fd91..488d2754c27c 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.c
+++ b/drivers/media/platform/am437x/am437x-vpfe.c
@@ -307,7 +307,8 @@ static inline struct vpfe_device *to_vpfe(struct vpfe_ccdc *ccdc)
        return container_of(ccdc, struct vpfe_device, ccdc);
 }
-static inline struct vpfe_cap_buffer *to_vpfe_buffer(struct vb2_buffer *vb)
+static inline
+struct vpfe_cap_buffer *to_vpfe_buffer(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct vpfe_cap_buffer, vb);
 }
@@ -1257,14 +1258,14 @@ static inline void vpfe_schedule_next_buffer(struct vpfe_device *vpfe)
        list_del(&vpfe->next_frm->list);
        vpfe_set_sdr_addr(&vpfe->ccdc,
-                       vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb, 0));
+               vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb.vb2_buf, 0));
 }
 static inline void vpfe_schedule_bottom_field(struct vpfe_device *vpfe)
 {
        unsigned long addr;
-        addr = vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb, 0) +
+        addr = vb2_dma_contig_plane_dma_addr(&vpfe->next_frm->vb.vb2_buf, 0) +
                                        vpfe->field_off;
        vpfe_set_sdr_addr(&vpfe->ccdc, addr);
@@ -1280,10 +1281,10 @@ static inline void vpfe_schedule_bottom_field(struct vpfe_device *vpfe)
 */
 static inline void vpfe_process_buffer_complete(struct vpfe_device *vpfe)
 {
-        v4l2_get_timestamp(&vpfe->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vpfe->cur_frm->vb.timestamp);
-        vpfe->cur_frm->vb.v4l2_buf.field = vpfe->fmt.fmt.pix.field;
+        vpfe->cur_frm->vb.field = vpfe->fmt.fmt.pix.field;
-        vpfe->cur_frm->vb.v4l2_buf.sequence = vpfe->sequence++;
+        vpfe->cur_frm->vb.sequence = vpfe->sequence++;
-        vb2_buffer_done(&vpfe->cur_frm->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
        vpfe->cur_frm = vpfe->next_frm;
 }
@@ -1942,6 +1943,7 @@ static int vpfe_queue_setup(struct vb2_queue *vq,
 */
 static int vpfe_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue);
        vb2_set_plane_payload(vb, 0, vpfe->fmt.fmt.pix.sizeimage);
@@ -1949,7 +1951,7 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
        if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
                return -EINVAL;
-        vb->v4l2_buf.field = vpfe->fmt.fmt.pix.field;
+        vbuf->field = vpfe->fmt.fmt.pix.field;
        return 0;
 }
@@ -1960,8 +1962,9 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
 */
 static void vpfe_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpfe_device *vpfe = vb2_get_drv_priv(vb->vb2_queue);
-        struct vpfe_cap_buffer *buf = to_vpfe_buffer(vb);
+        struct vpfe_cap_buffer *buf = to_vpfe_buffer(vbuf);
        unsigned long flags = 0;
        /* add the buffer to the DMA queue */
@@ -2006,7 +2009,7 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
        list_del(&vpfe->cur_frm->list);
        spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags);
-        addr = vb2_dma_contig_plane_dma_addr(&vpfe->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&vpfe->cur_frm->vb.vb2_buf, 0);
        vpfe_set_sdr_addr(&vpfe->ccdc, (unsigned long)(addr));
@@ -2023,7 +2026,7 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
 err:
        list_for_each_entry_safe(buf, tmp, &vpfe->dma_queue, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        return ret;
@@ -2055,13 +2058,14 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        spin_lock_irqsave(&vpfe->dma_queue_lock, flags);
        if (vpfe->cur_frm == vpfe->next_frm) {
-                vb2_buffer_done(&vpfe->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        } else {
                if (vpfe->cur_frm != NULL)
-                        vb2_buffer_done(&vpfe->cur_frm->vb,
+                        vb2_buffer_done(&vpfe->cur_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                if (vpfe->next_frm != NULL)
-                        vb2_buffer_done(&vpfe->next_frm->vb,
+                        vb2_buffer_done(&vpfe->next_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
        }
@@ -2069,7 +2073,8 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
                vpfe->next_frm = list_entry(vpfe->dma_queue.next,
                                                struct vpfe_cap_buffer, list);
                list_del(&vpfe->next_frm->list);
-                vb2_buffer_done(&vpfe->next_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&vpfe->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&vpfe->dma_queue_lock, flags);
 }
diff --git a/drivers/media/platform/am437x/am437x-vpfe.h b/drivers/media/platform/am437x/am437x-vpfe.h
index 5bfb35649a39..777bf97fea57 100644
--- a/drivers/media/platform/am437x/am437x-vpfe.h
+++ b/drivers/media/platform/am437x/am437x-vpfe.h
@@ -31,6 +31,7 @@
 #include <media/v4l2-dev.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 #include "am437x-vpfe_regs.h"
@@ -104,7 +105,7 @@ struct vpfe_config {
 };
 struct vpfe_cap_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index b7e70fb05eb8..db059eb0ff19 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -54,7 +54,7 @@ struct bcap_format {
 };
 struct bcap_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -149,7 +149,7 @@ static const struct bcap_format bcap_formats[] = {
 static irqreturn_t bcap_isr(int irq, void *dev_id);
-static struct bcap_buffer *to_bcap_vb(struct vb2_buffer *vb)
+static struct bcap_buffer *to_bcap_vb(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct bcap_buffer, vb);
 }
@@ -223,6 +223,7 @@ static int bcap_queue_setup(struct vb2_queue *vq,
 static int bcap_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
        unsigned long size = bcap_dev->fmt.sizeimage;
@@ -233,15 +234,16 @@ static int bcap_buffer_prepare(struct vb2_buffer *vb)
        }
        vb2_set_plane_payload(vb, 0, size);
-        vb->v4l2_buf.field = bcap_dev->fmt.field;
+        vbuf->field = bcap_dev->fmt.field;
        return 0;
 }
 static void bcap_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct bcap_buffer *buf = to_bcap_vb(vb);
+        struct bcap_buffer *buf = to_bcap_vb(vbuf);
        unsigned long flags;
        spin_lock_irqsave(&bcap_dev->lock, flags);
@@ -251,8 +253,9 @@ static void bcap_buffer_queue(struct vb2_buffer *vb)
 static void bcap_buffer_cleanup(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct bcap_device *bcap_dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct bcap_buffer *buf = to_bcap_vb(vb);
+        struct bcap_buffer *buf = to_bcap_vb(vbuf);
        unsigned long flags;
        spin_lock_irqsave(&bcap_dev->lock, flags);
@@ -333,7 +336,8 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
                                        struct bcap_buffer, list);
        /* remove buffer from the dma queue */
        list_del_init(&bcap_dev->cur_frm->list);
-        addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb.vb2_buf,
+                                                0);
        /* update DMA address */
        ppi->ops->update_addr(ppi, (unsigned long)addr);
        /* enable ppi */
@@ -344,7 +348,7 @@ static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
 err:
        list_for_each_entry_safe(buf, tmp, &bcap_dev->dma_queue, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        return ret;
@@ -367,13 +371,15 @@ static void bcap_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        if (bcap_dev->cur_frm)
-                vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&bcap_dev->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        while (!list_empty(&bcap_dev->dma_queue)) {
                bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
                                                struct bcap_buffer, list);
                list_del_init(&bcap_dev->cur_frm->list);
-                vb2_buffer_done(&bcap_dev->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&bcap_dev->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
 }
@@ -392,18 +398,19 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
 {
        struct ppi_if *ppi = dev_id;
        struct bcap_device *bcap_dev = ppi->priv;
-        struct vb2_buffer *vb = &bcap_dev->cur_frm->vb;
+        struct vb2_v4l2_buffer *vbuf = &bcap_dev->cur_frm->vb;
+        struct vb2_buffer *vb = &vbuf->vb2_buf;
        dma_addr_t addr;
        spin_lock(&bcap_dev->lock);
        if (!list_empty(&bcap_dev->dma_queue)) {
-                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbuf->timestamp);
                if (ppi->err) {
                        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
                        ppi->err = false;
                } else {
-                        vb->v4l2_buf.sequence = bcap_dev->sequence++;
+                        vbuf->sequence = bcap_dev->sequence++;
                        vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
                }
                bcap_dev->cur_frm = list_entry(bcap_dev->dma_queue.next,
@@ -420,7 +427,8 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
        if (bcap_dev->stop) {
                complete(&bcap_dev->comp);
        } else {
-                addr = vb2_dma_contig_plane_dma_addr(&bcap_dev->cur_frm->vb, 0);
+                addr = vb2_dma_contig_plane_dma_addr(
+                                &bcap_dev->cur_frm->vb.vb2_buf, 0);
                ppi->ops->update_addr(ppi, (unsigned long)addr);
                ppi->ops->start(ppi);
        }
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index cd41d49b206d..654e964f84a2 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -179,31 +179,32 @@ static void coda_kfifo_sync_to_device_write(struct coda_ctx *ctx)
 }
 static int coda_bitstream_queue(struct coda_ctx *ctx,
-                                struct vb2_buffer *src_buf)
+                                struct vb2_v4l2_buffer *src_buf)
 {
-        u32 src_size = vb2_get_plane_payload(src_buf, 0);
+        u32 src_size = vb2_get_plane_payload(&src_buf->vb2_buf, 0);
        u32 n;
-        n = kfifo_in(&ctx->bitstream_fifo, vb2_plane_vaddr(src_buf, 0),
+        n = kfifo_in(&ctx->bitstream_fifo,
-                     src_size);
+                        vb2_plane_vaddr(&src_buf->vb2_buf, 0), src_size);
        if (n < src_size)
                return -ENOSPC;
-        src_buf->v4l2_buf.sequence = ctx->qsequence++;
+        src_buf->sequence = ctx->qsequence++;
        return 0;
 }
 static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
-                                     struct vb2_buffer *src_buf)
+                                     struct vb2_v4l2_buffer *src_buf)
 {
        int ret;
        if (coda_get_bitstream_payload(ctx) +
-            vb2_get_plane_payload(src_buf, 0) + 512 >= ctx->bitstream.size)
+            vb2_get_plane_payload(&src_buf->vb2_buf, 0) + 512 >=
+            ctx->bitstream.size)
                return false;
-        if (vb2_plane_vaddr(src_buf, 0) == NULL) {
+        if (vb2_plane_vaddr(&src_buf->vb2_buf, 0) == NULL) {
                v4l2_err(&ctx->dev->v4l2_dev, "trying to queue empty buffer\n");
                return true;
        }
@@ -224,7 +225,7 @@ static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
 void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
 {
-        struct vb2_buffer *src_buf;
+        struct vb2_v4l2_buffer *src_buf;
        struct coda_buffer_meta *meta;
        unsigned long flags;
        u32 start;
@@ -257,7 +258,7 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
                }
                /* Dump empty buffers */
-                if (!vb2_get_plane_payload(src_buf, 0)) {
+                if (!vb2_get_plane_payload(&src_buf->vb2_buf, 0)) {
                        src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
                        v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
                        continue;
@@ -276,9 +277,9 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
                        meta = kmalloc(sizeof(*meta), GFP_KERNEL);
                        if (meta) {
-                                meta->sequence = src_buf->v4l2_buf.sequence;
+                                meta->sequence = src_buf->sequence;
-                                meta->timecode = src_buf->v4l2_buf.timecode;
+                                meta->timecode = src_buf->timecode;
-                                meta->timestamp = src_buf->v4l2_buf.timestamp;
+                                meta->timestamp = src_buf->timestamp;
                                meta->start = start;
                                meta->end = ctx->bitstream_fifo.kfifo.in &
                                            ctx->bitstream_fifo.kfifo.mask;
@@ -483,20 +484,21 @@ err:
        return ret;
 }
-static int coda_encode_header(struct coda_ctx *ctx, struct vb2_buffer *buf,
+static int coda_encode_header(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                              int header_code, u8 *header, int *size)
 {
+        struct vb2_buffer *vb = &buf->vb2_buf;
        struct coda_dev *dev = ctx->dev;
        size_t bufsize;
        int ret;
        int i;
        if (dev->devtype->product == CODA_960)
-                memset(vb2_plane_vaddr(buf, 0), 0, 64);
+                memset(vb2_plane_vaddr(vb, 0), 0, 64);
-        coda_write(dev, vb2_dma_contig_plane_dma_addr(buf, 0),
+        coda_write(dev, vb2_dma_contig_plane_dma_addr(vb, 0),
                   CODA_CMD_ENC_HEADER_BB_START);
-        bufsize = vb2_plane_size(buf, 0);
+        bufsize = vb2_plane_size(vb, 0);
        if (dev->devtype->product == CODA_960)
                bufsize /= 1024;
        coda_write(dev, bufsize, CODA_CMD_ENC_HEADER_BB_SIZE);
@@ -509,14 +511,14 @@ static int coda_encode_header(struct coda_ctx *ctx, struct vb2_buffer *buf,
        if (dev->devtype->product == CODA_960) {
                for (i = 63; i > 0; i--)
-                        if (((char *)vb2_plane_vaddr(buf, 0))[i] != 0)
+                        if (((char *)vb2_plane_vaddr(vb, 0))[i] != 0)
                                break;
                *size = i + 1;
        } else {
                *size = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx)) -
                        coda_read(dev, CODA_CMD_ENC_HEADER_BB_START);
        }
-        memcpy(header, vb2_plane_vaddr(buf, 0), *size);
+        memcpy(header, vb2_plane_vaddr(vb, 0), *size);
        return 0;
 }
@@ -799,7 +801,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
        struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
        struct coda_q_data *q_data_src, *q_data_dst;
        u32 bitstream_buf, bitstream_size;
-        struct vb2_buffer *buf;
+        struct vb2_v4l2_buffer *buf;
        int gamma, ret, value;
        u32 dst_fourcc;
        int num_fb;
@@ -810,7 +812,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
        dst_fourcc = q_data_dst->fourcc;
        buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-        bitstream_buf = vb2_dma_contig_plane_dma_addr(buf, 0);
+        bitstream_buf = vb2_dma_contig_plane_dma_addr(&buf->vb2_buf, 0);
        bitstream_size = q_data_dst->sizeimage;
        if (!coda_is_initialized(dev)) {
@@ -1185,7 +1187,7 @@ out:
 static int coda_prepare_encode(struct coda_ctx *ctx)
 {
        struct coda_q_data *q_data_src, *q_data_dst;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        struct coda_dev *dev = ctx->dev;
        int force_ipicture;
        int quant_param = 0;
@@ -1200,8 +1202,8 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
        q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
        dst_fourcc = q_data_dst->fourcc;
-        src_buf->v4l2_buf.sequence = ctx->osequence;
+        src_buf->sequence = ctx->osequence;
-        dst_buf->v4l2_buf.sequence = ctx->osequence;
+        dst_buf->sequence = ctx->osequence;
        ctx->osequence++;
        /*
@@ -1209,12 +1211,12 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
         * frame as IDR. This is a problem for some decoders that can't
         * recover when a frame is lost.
         */
-        if (src_buf->v4l2_buf.sequence % ctx->params.gop_size) {
+        if (src_buf->sequence % ctx->params.gop_size) {
-                src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME;
+                src_buf->flags |= V4L2_BUF_FLAG_PFRAME;
-                src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME;
+                src_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME;
        } else {
-                src_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+                src_buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
-                src_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME;
+                src_buf->flags &= ~V4L2_BUF_FLAG_PFRAME;
        }
        if (dev->devtype->product == CODA_960)
@@ -1224,9 +1226,9 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
         * Copy headers at the beginning of the first frame for H.264 only.
         * In MPEG4 they are already copied by the coda.
         */
-        if (src_buf->v4l2_buf.sequence == 0) {
+        if (src_buf->sequence == 0) {
                pic_stream_buffer_addr =
-                        vb2_dma_contig_plane_dma_addr(dst_buf, 0) +
+                        vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0) +
                        ctx->vpu_header_size[0] +
                        ctx->vpu_header_size[1] +
                        ctx->vpu_header_size[2];
@@ -1234,20 +1236,21 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
                        ctx->vpu_header_size[0] -
                        ctx->vpu_header_size[1] -
                        ctx->vpu_header_size[2];
-                memcpy(vb2_plane_vaddr(dst_buf, 0),
+                memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0),
                       &ctx->vpu_header[0][0], ctx->vpu_header_size[0]);
-                memcpy(vb2_plane_vaddr(dst_buf, 0) + ctx->vpu_header_size[0],
+                memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0)
-                       &ctx->vpu_header[1][0], ctx->vpu_header_size[1]);
+                        + ctx->vpu_header_size[0], &ctx->vpu_header[1][0],
-                memcpy(vb2_plane_vaddr(dst_buf, 0) + ctx->vpu_header_size[0] +
+                        ctx->vpu_header_size[1]);
-                        ctx->vpu_header_size[1], &ctx->vpu_header[2][0],
+                memcpy(vb2_plane_vaddr(&dst_buf->vb2_buf, 0)
-                        ctx->vpu_header_size[2]);
+                        + ctx->vpu_header_size[0] + ctx->vpu_header_size[1],
+                        &ctx->vpu_header[2][0], ctx->vpu_header_size[2]);
        } else {
                pic_stream_buffer_addr =
-                        vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+                        vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
                pic_stream_buffer_size = q_data_dst->sizeimage;
        }
-        if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) {
+        if (src_buf->flags & V4L2_BUF_FLAG_KEYFRAME) {
                force_ipicture = 1;
                switch (dst_fourcc) {
                case V4L2_PIX_FMT_H264:
@@ -1324,7 +1327,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
 static void coda_finish_encode(struct coda_ctx *ctx)
 {
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        struct coda_dev *dev = ctx->dev;
        u32 wr_ptr, start_ptr;
@@ -1338,13 +1341,13 @@ static void coda_finish_encode(struct coda_ctx *ctx)
        wr_ptr = coda_read(dev, CODA_REG_BIT_WR_PTR(ctx->reg_idx));
        /* Calculate bytesused field */
-        if (dst_buf->v4l2_buf.sequence == 0) {
+        if (dst_buf->sequence == 0) {
-                vb2_set_plane_payload(dst_buf, 0, wr_ptr - start_ptr +
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
                                        ctx->vpu_header_size[0] +
                                        ctx->vpu_header_size[1] +
                                        ctx->vpu_header_size[2]);
        } else {
-                vb2_set_plane_payload(dst_buf, 0, wr_ptr - start_ptr);
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, wr_ptr - start_ptr);
        }
        v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev, "frame size = %u\n",
@@ -1354,18 +1357,18 @@ static void coda_finish_encode(struct coda_ctx *ctx)
        coda_read(dev, CODA_RET_ENC_PIC_FLAG);
        if (coda_read(dev, CODA_RET_ENC_PIC_TYPE) == 0) {
-                dst_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+                dst_buf->flags |= V4L2_BUF_FLAG_KEYFRAME;
-                dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_PFRAME;
+                dst_buf->flags &= ~V4L2_BUF_FLAG_PFRAME;
        } else {
-                dst_buf->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME;
+                dst_buf->flags |= V4L2_BUF_FLAG_PFRAME;
-                dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_KEYFRAME;
+                dst_buf->flags &= ~V4L2_BUF_FLAG_KEYFRAME;
        }
-        dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
+        dst_buf->timestamp = src_buf->timestamp;
-        dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_buf->v4l2_buf.flags |=
+        dst_buf->flags |=
-                src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
+        dst_buf->timecode = src_buf->timecode;
        v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
@@ -1378,8 +1381,8 @@ static void coda_finish_encode(struct coda_ctx *ctx)
        v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
                "job finished: encoding frame (%d) (%s)\n",
-                dst_buf->v4l2_buf.sequence,
+                dst_buf->sequence,
-                (dst_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) ?
+                (dst_buf->flags & V4L2_BUF_FLAG_KEYFRAME) ?
                "KEYFRAME" : "PFRAME");
 }
@@ -1716,7 +1719,7 @@ static int coda_start_decoding(struct coda_ctx *ctx)
 static int coda_prepare_decode(struct coda_ctx *ctx)
 {
-        struct vb2_buffer *dst_buf;
+        struct vb2_v4l2_buffer *dst_buf;
        struct coda_dev *dev = ctx->dev;
        struct coda_q_data *q_data_dst;
        struct coda_buffer_meta *meta;
@@ -1763,7 +1766,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
                 * well as the rotator buffer output.
                 * ROT_INDEX needs to be < 0x40, but > ctx->num_internal_frames.
                 */
-                coda_write(dev, CODA_MAX_FRAMEBUFFERS + dst_buf->v4l2_buf.index,
+                coda_write(dev, CODA_MAX_FRAMEBUFFERS + dst_buf->vb2_buf.index,
                                CODA9_CMD_DEC_PIC_ROT_INDEX);
                reg_addr = CODA9_CMD_DEC_PIC_ROT_ADDR_Y;
@@ -1838,7 +1841,7 @@ static void coda_finish_decode(struct coda_ctx *ctx)
        struct coda_dev *dev = ctx->dev;
        struct coda_q_data *q_data_src;
        struct coda_q_data *q_data_dst;
-        struct vb2_buffer *dst_buf;
+        struct vb2_v4l2_buffer *dst_buf;
        struct coda_buffer_meta *meta;
        unsigned long payload;
        unsigned long flags;
@@ -2029,15 +2032,15 @@ static void coda_finish_decode(struct coda_ctx *ctx)
        if (ctx->display_idx >= 0 &&
            ctx->display_idx < ctx->num_internal_frames) {
                dst_buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-                dst_buf->v4l2_buf.sequence = ctx->osequence++;
+                dst_buf->sequence = ctx->osequence++;
-                dst_buf->v4l2_buf.flags &= ~(V4L2_BUF_FLAG_KEYFRAME |
+                dst_buf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME |
                                             V4L2_BUF_FLAG_PFRAME |
                                             V4L2_BUF_FLAG_BFRAME);
-                dst_buf->v4l2_buf.flags |= ctx->frame_types[ctx->display_idx];
+                dst_buf->flags |= ctx->frame_types[ctx->display_idx];
                meta = &ctx->frame_metas[ctx->display_idx];
-                dst_buf->v4l2_buf.timecode = meta->timecode;
+                dst_buf->timecode = meta->timecode;
-                dst_buf->v4l2_buf.timestamp = meta->timestamp;
+                dst_buf->timestamp = meta->timestamp;
                trace_coda_dec_rot_done(ctx, dst_buf, meta);
@@ -2052,15 +2055,15 @@ static void coda_finish_decode(struct coda_ctx *ctx)
                        payload = width * height * 2;
                        break;
                }
-                vb2_set_plane_payload(dst_buf, 0, payload);
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload);
                coda_m2m_buf_done(ctx, dst_buf, ctx->frame_errors[display_idx] ?
                                  VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
                        "job finished: decoding frame (%d) (%s)\n",
-                        dst_buf->v4l2_buf.sequence,
+                        dst_buf->sequence,
-                        (dst_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) ?
+                        (dst_buf->flags & V4L2_BUF_FLAG_KEYFRAME) ?
                        "KEYFRAME" : "PFRAME");
        } else {
                v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 998fe6614b33..60336eec75af 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -84,9 +84,9 @@ unsigned int coda_read(struct coda_dev *dev, u32 reg)
 }
 void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
-                     struct vb2_buffer *buf, unsigned int reg_y)
+                     struct vb2_v4l2_buffer *buf, unsigned int reg_y)
 {
-        u32 base_y = vb2_dma_contig_plane_dma_addr(buf, 0);
+        u32 base_y = vb2_dma_contig_plane_dma_addr(&buf->vb2_buf, 0);
        u32 base_cb, base_cr;
        switch (q_data->fourcc) {
@@ -684,17 +684,17 @@ static int coda_qbuf(struct file *file, void *priv,
 }
 static bool coda_buf_is_end_of_stream(struct coda_ctx *ctx,
-                                      struct vb2_buffer *buf)
+                                      struct vb2_v4l2_buffer *buf)
 {
        struct vb2_queue *src_vq;
        src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
        return ((ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG) &&
-                (buf->v4l2_buf.sequence == (ctx->qsequence - 1)));
+                (buf->sequence == (ctx->qsequence - 1)));
 }
-void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf,
+void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                       enum vb2_buffer_state state)
 {
        const struct v4l2_event eos_event = {
@@ -702,7 +702,7 @@ void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf,
        };
        if (coda_buf_is_end_of_stream(ctx, buf)) {
-                buf->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST;
+                buf->flags |= V4L2_BUF_FLAG_LAST;
                v4l2_event_queue_fh(&ctx->fh, &eos_event);
        }
@@ -1175,6 +1175,7 @@ static int coda_buf_prepare(struct vb2_buffer *vb)
 static void coda_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct coda_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct vb2_queue *vq = vb->vb2_queue;
        struct coda_q_data *q_data;
@@ -1193,12 +1194,12 @@ static void coda_buf_queue(struct vb2_buffer *vb)
                if (vb2_get_plane_payload(vb, 0) == 0)
                        coda_bit_stream_end_flag(ctx);
                mutex_lock(&ctx->bitstream_mutex);
-                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
                if (vb2_is_streaming(vb->vb2_queue))
                        coda_fill_bitstream(ctx, true);
                mutex_unlock(&ctx->bitstream_mutex);
        } else {
-                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
        }
 }
@@ -1247,7 +1248,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
        struct coda_ctx *ctx = vb2_get_drv_priv(q);
        struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev;
        struct coda_q_data *q_data_src, *q_data_dst;
-        struct vb2_buffer *buf;
+        struct vb2_v4l2_buffer *buf;
        int ret = 0;
        q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
@@ -1338,7 +1339,7 @@ static void coda_stop_streaming(struct vb2_queue *q)
 {
        struct coda_ctx *ctx = vb2_get_drv_priv(q);
        struct coda_dev *dev = ctx->dev;
-        struct vb2_buffer *buf;
+        struct vb2_v4l2_buffer *buf;
        unsigned long flags;
        bool stop;
diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/coda/coda-jpeg.c
index 11e734bc2cbd..96cd42a0baaf 100644
--- a/drivers/media/platform/coda/coda-jpeg.c
+++ b/drivers/media/platform/coda/coda-jpeg.c
@@ -178,12 +178,12 @@ int coda_jpeg_write_tables(struct coda_ctx *ctx)
        return 0;
 }
-bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb)
+bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb)
 {
-        void *vaddr = vb2_plane_vaddr(vb, 0);
+        void *vaddr = vb2_plane_vaddr(&vb->vb2_buf, 0);
        u16 soi = be16_to_cpup((__be16 *)vaddr);
        u16 eoi = be16_to_cpup((__be16 *)(vaddr +
-                                          vb2_get_plane_payload(vb, 0) - 2));
+                          vb2_get_plane_payload(&vb->vb2_buf, 0) - 2));
        return soi == SOI_MARKER && eoi == EOI_MARKER;
 }
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
index feb9671a12bd..96532b06bd9e 100644
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -243,7 +243,7 @@ extern int coda_debug;
 void coda_write(struct coda_dev *dev, u32 data, u32 reg);
 unsigned int coda_read(struct coda_dev *dev, u32 reg);
 void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
-                     struct vb2_buffer *buf, unsigned int reg_y);
+                     struct vb2_v4l2_buffer *buf, unsigned int reg_y);
 int coda_alloc_aux_buf(struct coda_dev *dev, struct coda_aux_buf *buf,
                       size_t size, const char *name, struct dentry *parent);
@@ -284,12 +284,12 @@ static inline unsigned int coda_get_bitstream_payload(struct coda_ctx *ctx)
 void coda_bit_stream_end_flag(struct coda_ctx *ctx);
-void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_buffer *buf,
+void coda_m2m_buf_done(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                       enum vb2_buffer_state state);
 int coda_h264_padding(int size, char *p);
-bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb);
+bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_v4l2_buffer *vb);
 int coda_jpeg_write_tables(struct coda_ctx *ctx);
 void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality);
diff --git a/drivers/media/platform/coda/trace.h b/drivers/media/platform/coda/trace.h
index 9db6a6662913..f20666a4aa89 100644
--- a/drivers/media/platform/coda/trace.h
+++ b/drivers/media/platform/coda/trace.h
@@ -49,7 +49,7 @@ TRACE_EVENT(coda_bit_done,
 );
 DECLARE_EVENT_CLASS(coda_buf_class,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
        TP_ARGS(ctx, buf),
@@ -61,7 +61,7 @@ DECLARE_EVENT_CLASS(coda_buf_class,
        TP_fast_assign(
                __entry->minor = ctx->fh.vdev->minor;
-                __entry->index = buf->v4l2_buf.index;
+                __entry->index = buf->vb2_buf.index;
                __entry->ctx = ctx->idx;
        ),
@@ -70,17 +70,17 @@ DECLARE_EVENT_CLASS(coda_buf_class,
 );
 DEFINE_EVENT(coda_buf_class, coda_enc_pic_run,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
        TP_ARGS(ctx, buf)
 );
 DEFINE_EVENT(coda_buf_class, coda_enc_pic_done,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
        TP_ARGS(ctx, buf)
 );
 DECLARE_EVENT_CLASS(coda_buf_meta_class,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                 struct coda_buffer_meta *meta),
        TP_ARGS(ctx, buf, meta),
@@ -95,7 +95,7 @@ DECLARE_EVENT_CLASS(coda_buf_meta_class,
        TP_fast_assign(
                __entry->minor = ctx->fh.vdev->minor;
-                __entry->index = buf->v4l2_buf.index;
+                __entry->index = buf->vb2_buf.index;
                __entry->start = meta->start;
                __entry->end = meta->end;
                __entry->ctx = ctx->idx;
@@ -107,7 +107,7 @@ DECLARE_EVENT_CLASS(coda_buf_meta_class,
 );
 DEFINE_EVENT(coda_buf_meta_class, coda_bit_queue,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                 struct coda_buffer_meta *meta),
        TP_ARGS(ctx, buf, meta)
 );
@@ -146,7 +146,7 @@ DEFINE_EVENT(coda_meta_class, coda_dec_pic_done,
 );
 DEFINE_EVENT(coda_buf_meta_class, coda_dec_rot_done,
-        TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,
+        TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                 struct coda_buffer_meta *meta),
        TP_ARGS(ctx, buf, meta)
 );
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index f69cdd7da10c..39f8ccfae339 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -74,8 +74,8 @@ static void vpbe_isr_even_field(struct vpbe_display *disp_obj,
        if (layer->cur_frm == layer->next_frm)
                return;
-        v4l2_get_timestamp(&layer->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&layer->cur_frm->vb.timestamp);
-        vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&layer->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
        /* Make cur_frm pointing to next_frm */
        layer->cur_frm = layer->next_frm;
 }
@@ -104,8 +104,8 @@ static void vpbe_isr_odd_field(struct vpbe_display *disp_obj,
        list_del(&layer->next_frm->list);
        spin_unlock(&disp_obj->dma_queue_lock);
        /* Mark state of the frame to active */
-        layer->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        layer->next_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
-        addr = vb2_dma_contig_plane_dma_addr(&layer->next_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&layer->next_frm->vb.vb2_buf, 0);
        osd_device->ops.start_layer(osd_device,
                        layer->layer_info.id,
                        addr,
@@ -259,8 +259,9 @@ vpbe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 */
 static void vpbe_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        /* Get the file handle object and layer object */
-        struct vpbe_disp_buffer *buf = container_of(vb,
+        struct vpbe_disp_buffer *buf = container_of(vbuf,
                                struct vpbe_disp_buffer, vb);
        struct vpbe_layer *layer = vb2_get_drv_priv(vb->vb2_queue);
        struct vpbe_display *disp = layer->disp_dev;
@@ -290,7 +291,7 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
        /* Remove buffer from the buffer queue */
        list_del(&layer->cur_frm->list);
        /* Mark state of the current frame to active */
-        layer->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        layer->cur_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
        /* Initialize field_id and started member */
        layer->field_id = 0;
@@ -299,10 +300,12 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
        if (ret < 0) {
                struct vpbe_disp_buffer *buf, *tmp;
-                vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_QUEUED);
                list_for_each_entry_safe(buf, tmp, &layer->dma_queue, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
                return ret;
@@ -332,13 +335,14 @@ static void vpbe_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        spin_lock_irqsave(&disp->dma_queue_lock, flags);
        if (layer->cur_frm == layer->next_frm) {
-                vb2_buffer_done(&layer->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        } else {
                if (layer->cur_frm != NULL)
-                        vb2_buffer_done(&layer->cur_frm->vb,
+                        vb2_buffer_done(&layer->cur_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                if (layer->next_frm != NULL)
-                        vb2_buffer_done(&layer->next_frm->vb,
+                        vb2_buffer_done(&layer->next_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
        }
@@ -346,7 +350,8 @@ static void vpbe_stop_streaming(struct vb2_queue *vq)
                layer->next_frm = list_entry(layer->dma_queue.next,
                                                struct vpbe_disp_buffer, list);
                list_del(&layer->next_frm->list);
-                vb2_buffer_done(&layer->next_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&layer->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&disp->dma_queue_lock, flags);
 }
@@ -383,7 +388,7 @@ static int vpbe_set_osd_display_params(struct vpbe_display *disp_dev,
        unsigned long addr;
        int ret;
-        addr = vb2_dma_contig_plane_dma_addr(&layer->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&layer->cur_frm->vb.vb2_buf, 0);
        /* Set address in the display registers */
        osd_device->ops.start_layer(osd_device,
                                    layer->layer_info.id,
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index a5f548138b91..b29bb64db8bf 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -57,7 +57,8 @@ static u8 channel_first_int[VPIF_NUMBER_OF_OBJECTS][2] = { {1, 1} };
 /* Is set to 1 in case of SDTV formats, 2 in case of HDTV formats. */
 static int ycmux_mode;
-static inline struct vpif_cap_buffer *to_vpif_buffer(struct vb2_buffer *vb)
+static inline
+struct vpif_cap_buffer *to_vpif_buffer(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct vpif_cap_buffer, vb);
 }
@@ -72,6 +73,7 @@ static inline struct vpif_cap_buffer *to_vpif_buffer(struct vb2_buffer *vb)
 */
 static int vpif_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *q = vb->vb2_queue;
        struct channel_obj *ch = vb2_get_drv_priv(q);
        struct common_obj *common;
@@ -85,7 +87,7 @@ static int vpif_buffer_prepare(struct vb2_buffer *vb)
        if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
                return -EINVAL;
-        vb->v4l2_buf.field = common->fmt.fmt.pix.field;
+        vbuf->field = common->fmt.fmt.pix.field;
        addr = vb2_dma_contig_plane_dma_addr(vb, 0);
        if (!IS_ALIGNED((addr + common->ytop_off), 8) ||
@@ -145,8 +147,9 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
 */
 static void vpif_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
-        struct vpif_cap_buffer *buf = to_vpif_buffer(vb);
+        struct vpif_cap_buffer *buf = to_vpif_buffer(vbuf);
        struct common_obj *common;
        unsigned long flags;
@@ -214,7 +217,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
        list_del(&common->cur_frm->list);
        spin_unlock_irqrestore(&common->irqlock, flags);
-        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb.vb2_buf, 0);
        common->set_addr(addr + common->ytop_off,
                         addr + common->ybtm_off,
@@ -243,7 +246,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 err:
        list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        spin_unlock_irqrestore(&common->irqlock, flags);
@@ -286,13 +289,14 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        spin_lock_irqsave(&common->irqlock, flags);
        if (common->cur_frm == common->next_frm) {
-                vb2_buffer_done(&common->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        } else {
                if (common->cur_frm != NULL)
-                        vb2_buffer_done(&common->cur_frm->vb,
+                        vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                if (common->next_frm != NULL)
-                        vb2_buffer_done(&common->next_frm->vb,
+                        vb2_buffer_done(&common->next_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
        }
@@ -300,7 +304,8 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
                common->next_frm = list_entry(common->dma_queue.next,
                                                struct vpif_cap_buffer, list);
                list_del(&common->next_frm->list);
-                vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&common->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&common->irqlock, flags);
 }
@@ -325,9 +330,8 @@ static struct vb2_ops video_qops = {
 */
 static void vpif_process_buffer_complete(struct common_obj *common)
 {
-        v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&common->cur_frm->vb.timestamp);
-        vb2_buffer_done(&common->cur_frm->vb,
+        vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
-                                            VB2_BUF_STATE_DONE);
        /* Make curFrm pointing to nextFrm */
        common->cur_frm = common->next_frm;
 }
@@ -350,7 +354,7 @@ static void vpif_schedule_next_buffer(struct common_obj *common)
        /* Remove that buffer from the buffer queue */
        list_del(&common->next_frm->list);
        spin_unlock(&common->irqlock);
-        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb.vb2_buf, 0);
        /* Set top and bottom field addresses in VPIF registers */
        common->set_addr(addr + common->ytop_off,
diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index 8b8a663f6b22..4a7600929b61 100644
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -52,7 +52,7 @@ struct video_obj {
 };
 struct vpif_cap_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 682e5d578bf7..f51518c5b787 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -53,7 +53,8 @@ static struct device *vpif_dev;
 static void vpif_calculate_offsets(struct channel_obj *ch);
 static void vpif_config_addr(struct channel_obj *ch, int muxmode);
-static inline struct vpif_disp_buffer *to_vpif_buffer(struct vb2_buffer *vb)
+static inline
+struct vpif_disp_buffer *to_vpif_buffer(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct vpif_disp_buffer, vb);
 }
@@ -68,6 +69,7 @@ static inline struct vpif_disp_buffer *to_vpif_buffer(struct vb2_buffer *vb)
 */
 static int vpif_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
        struct common_obj *common;
@@ -77,7 +79,7 @@ static int vpif_buffer_prepare(struct vb2_buffer *vb)
        if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
                return -EINVAL;
-        vb->v4l2_buf.field = common->fmt.fmt.pix.field;
+        vbuf->field = common->fmt.fmt.pix.field;
        if (vb->vb2_queue->type != V4L2_BUF_TYPE_SLICED_VBI_OUTPUT) {
                unsigned long addr = vb2_dma_contig_plane_dma_addr(vb, 0);
@@ -138,7 +140,8 @@ static int vpif_buffer_queue_setup(struct vb2_queue *vq,
 */
 static void vpif_buffer_queue(struct vb2_buffer *vb)
 {
-        struct vpif_disp_buffer *buf = to_vpif_buffer(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct vpif_disp_buffer *buf = to_vpif_buffer(vbuf);
        struct channel_obj *ch = vb2_get_drv_priv(vb->vb2_queue);
        struct common_obj *common;
        unsigned long flags;
@@ -197,7 +200,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
        list_del(&common->cur_frm->list);
        spin_unlock_irqrestore(&common->irqlock, flags);
-        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&common->cur_frm->vb.vb2_buf, 0);
        common->set_addr((addr + common->ytop_off),
                            (addr + common->ybtm_off),
                            (addr + common->ctop_off),
@@ -229,7 +232,7 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 err:
        list_for_each_entry_safe(buf, tmp, &common->dma_queue, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_QUEUED);
        }
        spin_unlock_irqrestore(&common->irqlock, flags);
@@ -264,13 +267,14 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        spin_lock_irqsave(&common->irqlock, flags);
        if (common->cur_frm == common->next_frm) {
-                vb2_buffer_done(&common->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        } else {
                if (common->cur_frm != NULL)
-                        vb2_buffer_done(&common->cur_frm->vb,
+                        vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                if (common->next_frm != NULL)
-                        vb2_buffer_done(&common->next_frm->vb,
+                        vb2_buffer_done(&common->next_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
        }
@@ -278,7 +282,8 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
                common->next_frm = list_entry(common->dma_queue.next,
                                                struct vpif_disp_buffer, list);
                list_del(&common->next_frm->list);
-                vb2_buffer_done(&common->next_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&common->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&common->irqlock, flags);
 }
@@ -306,7 +311,7 @@ static void process_progressive_mode(struct common_obj *common)
        spin_unlock(&common->irqlock);
        /* Set top and bottom field addrs in VPIF registers */
-        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&common->next_frm->vb.vb2_buf, 0);
        common->set_addr(addr + common->ytop_off,
                                 addr + common->ybtm_off,
                                 addr + common->ctop_off,
@@ -324,10 +329,10 @@ static void process_interlaced_mode(int fid, struct common_obj *common)
                /* one frame is displayed If next frame is
                 *  available, release cur_frm and move on */
                /* Copy frame display time */
-                v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&common->cur_frm->vb.timestamp);
                /* Change status of the cur_frm */
-                vb2_buffer_done(&common->cur_frm->vb,
+                vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
-                                            VB2_BUF_STATE_DONE);
+                                        VB2_BUF_STATE_DONE);
                /* Make cur_frm pointing to next_frm */
                common->cur_frm = common->next_frm;
@@ -380,10 +385,10 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
                        if (!channel_first_int[i][channel_id]) {
                                /* Mark status of the cur_frm to
                                 * done and unlock semaphore on it */
-                                v4l2_get_timestamp(&common->cur_frm->vb.
+                                v4l2_get_timestamp(
-                                                   v4l2_buf.timestamp);
+                                        &common->cur_frm->vb.timestamp);
-                                vb2_buffer_done(&common->cur_frm->vb,
+                                vb2_buffer_done(&common->cur_frm->vb.vb2_buf,
-                                            VB2_BUF_STATE_DONE);
+                                                VB2_BUF_STATE_DONE);
                                /* Make cur_frm pointing to next_frm */
                                common->cur_frm = common->next_frm;
                        }
diff --git a/drivers/media/platform/davinci/vpif_display.h b/drivers/media/platform/davinci/vpif_display.h
index 849e0e385f18..e7a1723a1b7a 100644
--- a/drivers/media/platform/davinci/vpif_display.h
+++ b/drivers/media/platform/davinci/vpif_display.h
@@ -62,7 +62,7 @@ struct video_obj {
 };
 struct vpif_disp_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index 769ff50a95a2..e93a2336cfa2 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -136,7 +136,7 @@ struct gsc_fmt {
 * @idx : index of G-Scaler input buffer
 */
 struct gsc_input_buf {
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head        list;
        int                     idx;
 };
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index d5cffef2e227..59d134d1fa93 100644
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -77,7 +77,7 @@ static void gsc_m2m_stop_streaming(struct vb2_queue *q)
 void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
 {
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        if (!ctx || !ctx->m2m_ctx)
                return;
@@ -86,11 +86,11 @@ void gsc_m2m_job_finish(struct gsc_ctx *ctx, int vb_state)
        dst_vb = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
        if (src_vb && dst_vb) {
-                dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+                dst_vb->timestamp = src_vb->timestamp;
-                dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
+                dst_vb->timecode = src_vb->timecode;
-                dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                dst_vb->v4l2_buf.flags |=
+                dst_vb->flags |=
-                        src_vb->v4l2_buf.flags
+                        src_vb->flags
                        & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
                v4l2_m2m_buf_done(src_vb, vb_state);
@@ -109,23 +109,23 @@ static void gsc_m2m_job_abort(void *priv)
 static int gsc_get_bufs(struct gsc_ctx *ctx)
 {
        struct gsc_frame *s_frame, *d_frame;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        int ret;
        s_frame = &ctx->s_frame;
        d_frame = &ctx->d_frame;
        src_vb = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
-        ret = gsc_prepare_addr(ctx, src_vb, s_frame, &s_frame->addr);
+        ret = gsc_prepare_addr(ctx, &src_vb->vb2_buf, s_frame, &s_frame->addr);
        if (ret)
                return ret;
        dst_vb = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
-        ret = gsc_prepare_addr(ctx, dst_vb, d_frame, &d_frame->addr);
+        ret = gsc_prepare_addr(ctx, &dst_vb->vb2_buf, d_frame, &d_frame->addr);
        if (ret)
                return ret;
-        dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+        dst_vb->timestamp = src_vb->timestamp;
        return 0;
 }
@@ -255,12 +255,13 @@ static int gsc_m2m_buf_prepare(struct vb2_buffer *vb)
 static void gsc_m2m_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct gsc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        pr_debug("ctx: %p, ctx->state: 0x%x", ctx, ctx->state);
        if (ctx->m2m_ctx)
-                v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
+                v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
 }
 static struct vb2_ops gsc_m2m_qops = {
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index b1cdadccf2d7..fa698e7b916b 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -103,7 +103,7 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend)
        /* Release unused buffers */
        while (!suspend && !list_empty(&cap->pending_buf_q)) {
                buf = fimc_pending_queue_pop(cap);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        /* If suspending put unused buffers onto pending queue */
        while (!list_empty(&cap->active_buf_q)) {
@@ -111,7 +111,7 @@ static int fimc_capture_state_cleanup(struct fimc_dev *fimc, bool suspend)
                if (suspend)
                        fimc_pending_queue_add(cap, buf);
                else
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        fimc_hw_reset(fimc);
@@ -193,10 +193,10 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)
            test_bit(ST_CAPT_RUN, &fimc->state) && deq_buf) {
                v_buf = fimc_active_queue_pop(cap);
-                v4l2_get_timestamp(&v_buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&v_buf->vb.timestamp);
-                v_buf->vb.v4l2_buf.sequence = cap->frame_count++;
+                v_buf->vb.sequence = cap->frame_count++;
-                vb2_buffer_done(&v_buf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&v_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
        if (!list_empty(&cap->pending_buf_q)) {
@@ -227,7 +227,7 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, int deq_buf)
                list_for_each_entry(v_buf, &cap->active_buf_q, list) {
                        if (v_buf->index != index)
                                continue;
-                        vaddr = vb2_plane_vaddr(&v_buf->vb, plane);
+                        vaddr = vb2_plane_vaddr(&v_buf->vb.vb2_buf, plane);
                        v4l2_subdev_call(csis, video, s_rx_buffer,
                                         vaddr, &size);
                        break;
@@ -332,7 +332,7 @@ int fimc_capture_resume(struct fimc_dev *fimc)
                if (list_empty(&vid_cap->pending_buf_q))
                        break;
                buf = fimc_pending_queue_pop(vid_cap);
-                buffer_queue(&buf->vb);
+                buffer_queue(&buf->vb.vb2_buf);
        }
        return 0;
@@ -404,8 +404,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct fimc_vid_buffer *buf
-                = container_of(vb, struct fimc_vid_buffer, vb);
+                = container_of(vbuf, struct fimc_vid_buffer, vb);
        struct fimc_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct fimc_dev *fimc = ctx->fimc_dev;
        struct fimc_vid_cap *vid_cap = &fimc->vid_cap;
@@ -414,7 +415,7 @@ static void buffer_queue(struct vb2_buffer *vb)
        int min_bufs;
        spin_lock_irqsave(&fimc->slock, flags);
-        fimc_prepare_addr(ctx, &buf->vb, &ctx->d_frame, &buf->paddr);
+        fimc_prepare_addr(ctx, &buf->vb.vb2_buf, &ctx->d_frame, &buf->paddr);
        if (!test_bit(ST_CAPT_SUSPENDED, &fimc->state) &&
            !test_bit(ST_CAPT_STREAM, &fimc->state) &&
@@ -1466,7 +1467,8 @@ void fimc_sensor_notify(struct v4l2_subdev *sd, unsigned int notification,
                if (!list_empty(&fimc->vid_cap.active_buf_q)) {
                        buf = list_entry(fimc->vid_cap.active_buf_q.next,
                                         struct fimc_vid_buffer, list);
-                        vb2_set_plane_payload(&buf->vb, 0, *((u32 *)arg));
+                        vb2_set_plane_payload(&buf->vb.vb2_buf, 0,
+                                              *((u32 *)arg));
                }
                fimc_capture_irq_handler(fimc, 1);
                fimc_deactivate_capture(fimc);
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index ccb5d917292b..d336fa2916df 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -224,7 +224,7 @@ struct fimc_addr {
 * @index: buffer index for the output DMA engine
 */
 struct fimc_vid_buffer {
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head        list;
        struct fimc_addr        paddr;
        int                     index;
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c
index 195f9b5e9512..bacc3a389b7c 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp-video.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c
@@ -194,10 +194,11 @@ static int isp_video_capture_buffer_prepare(struct vb2_buffer *vb)
 static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct fimc_isp *isp = vb2_get_drv_priv(vb->vb2_queue);
        struct fimc_is_video *video = &isp->video_capture;
        struct fimc_is *is = fimc_isp_to_is(isp);
-        struct isp_video_buf *ivb = to_isp_video_buf(vb);
+        struct isp_video_buf *ivb = to_isp_video_buf(vbuf);
        unsigned long flags;
        unsigned int i;
@@ -220,7 +221,7 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
                        isp_dbg(2, &video->ve.vdev,
                                "dma_buf %pad (%d/%d/%d) addr: %pad\n",
-                                &buf_index, ivb->index, i, vb->v4l2_buf.index,
+                                &buf_index, ivb->index, i, vb->index,
                                &ivb->dma_addr[i]);
                }
@@ -242,7 +243,7 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb)
 void fimc_isp_video_irq_handler(struct fimc_is *is)
 {
        struct fimc_is_video *video = &is->isp.video_capture;
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        int buf_index;
        /* TODO: Ensure the DMA is really stopped in stop_streaming callback */
@@ -250,10 +251,10 @@ void fimc_isp_video_irq_handler(struct fimc_is *is)
                return;
        buf_index = (is->i2h_cmd.args[1] - 1) % video->buf_count;
-        vb = &video->buffers[buf_index]->vb;
+        vbuf = &video->buffers[buf_index]->vb;
-        v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vbuf->timestamp);
-        vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
        video->buf_mask &= ~BIT(buf_index);
        fimc_is_hw_set_isp_buf_mask(is, video->buf_mask);
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.h b/drivers/media/platform/exynos4-is/fimc-isp.h
index ad9908bb7966..c2d25df85db9 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp.h
+++ b/drivers/media/platform/exynos4-is/fimc-isp.h
@@ -102,7 +102,7 @@ struct fimc_isp_ctrls {
 };
 struct isp_video_buf {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        dma_addr_t dma_addr[FIMC_ISP_MAX_PLANES];
        unsigned int index;
 };
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index f56c69a63c9b..1920cfbd0369 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -200,7 +200,7 @@ static int fimc_lite_reinit(struct fimc_lite *fimc, bool suspend)
        /* Release unused buffers */
        while (!suspend && !list_empty(&fimc->pending_buf_q)) {
                buf = fimc_lite_pending_queue_pop(fimc);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        /* If suspending put unused buffers onto pending queue */
        while (!list_empty(&fimc->active_buf_q)) {
@@ -208,7 +208,7 @@ static int fimc_lite_reinit(struct fimc_lite *fimc, bool suspend)
                if (suspend)
                        fimc_lite_pending_queue_add(fimc, buf);
                else
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&fimc->slock, flags);
@@ -292,10 +292,10 @@ static irqreturn_t flite_irq_handler(int irq, void *priv)
            test_bit(ST_FLITE_RUN, &fimc->state) &&
            !list_empty(&fimc->active_buf_q)) {
                vbuf = fimc_lite_active_queue_pop(fimc);
-                v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbuf->vb.timestamp);
-                vbuf->vb.v4l2_buf.sequence = fimc->frame_count++;
+                vbuf->vb.sequence = fimc->frame_count++;
                flite_hw_mask_dma_buffer(fimc, vbuf->index);
-                vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&vbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
        if (test_bit(ST_FLITE_CONFIG, &fimc->state))
@@ -417,8 +417,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct flite_buffer *buf
-                = container_of(vb, struct flite_buffer, vb);
+                = container_of(vbuf, struct flite_buffer, vb);
        struct fimc_lite *fimc = vb2_get_drv_priv(vb->vb2_queue);
        unsigned long flags;
@@ -1632,7 +1633,7 @@ static int fimc_lite_resume(struct device *dev)
                if (list_empty(&fimc->pending_buf_q))
                        break;
                buf = fimc_lite_pending_queue_pop(fimc);
-                buffer_queue(&buf->vb);
+                buffer_queue(&buf->vb.vb2_buf);
        }
        return 0;
 }
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.h b/drivers/media/platform/exynos4-is/fimc-lite.h
index 7e4c7080e425..b302305dedbe 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.h
+++ b/drivers/media/platform/exynos4-is/fimc-lite.h
@@ -100,7 +100,7 @@ struct flite_frame {
 * @index: DMA start address register's index
 */
 struct flite_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        dma_addr_t paddr;
        unsigned short index;
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index 07bfddb322f8..79b8a3bfbd2b 100644
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -42,7 +42,7 @@ static unsigned int get_m2m_fmt_flags(unsigned int stream_type)
 void fimc_m2m_job_finish(struct fimc_ctx *ctx, int vb_state)
 {
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        if (!ctx || !ctx->fh.m2m_ctx)
                return;
@@ -99,7 +99,7 @@ static void stop_streaming(struct vb2_queue *q)
 static void fimc_device_run(void *priv)
 {
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        struct fimc_ctx *ctx = priv;
        struct fimc_frame *sf, *df;
        struct fimc_dev *fimc;
@@ -123,19 +123,19 @@ static void fimc_device_run(void *priv)
        }
        src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-        ret = fimc_prepare_addr(ctx, src_vb, sf, &sf->paddr);
+        ret = fimc_prepare_addr(ctx, &src_vb->vb2_buf, sf, &sf->paddr);
        if (ret)
                goto dma_unlock;
        dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-        ret = fimc_prepare_addr(ctx, dst_vb, df, &df->paddr);
+        ret = fimc_prepare_addr(ctx, &dst_vb->vb2_buf, df, &df->paddr);
        if (ret)
                goto dma_unlock;
-        dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+        dst_vb->timestamp = src_vb->timestamp;
-        dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_vb->v4l2_buf.flags |=
+        dst_vb->flags |=
-                src_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src_vb->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
        /* Reconfigure hardware if the context has changed. */
        if (fimc->m2m.ctx != ctx) {
@@ -220,8 +220,9 @@ static int fimc_buf_prepare(struct vb2_buffer *vb)
 static void fimc_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct fimc_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 struct vb2_ops fimc_qops = {
diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index c07f367aa436..bdd8f11d8fb1 100644
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -200,18 +200,18 @@ static void dma_callback(void *data)
 {
        struct deinterlace_ctx *curr_ctx = data;
        struct deinterlace_dev *pcdev = curr_ctx->dev;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        atomic_set(&pcdev->busy, 0);
        src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
        dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
-        dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+        dst_vb->timestamp = src_vb->timestamp;
-        dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_vb->v4l2_buf.flags |=
+        dst_vb->flags |=
-                src_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src_vb->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
+        dst_vb->timecode = src_vb->timecode;
        v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
        v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);
@@ -225,7 +225,7 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
                                  int do_callback)
 {
        struct deinterlace_q_data *s_q_data;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        struct deinterlace_dev *pcdev = ctx->dev;
        struct dma_chan *chan = pcdev->dma_chan;
        struct dma_device *dmadev = chan->device;
@@ -243,8 +243,9 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
        s_height = s_q_data->height;
        s_size = s_width * s_height;
-        p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0);
+        p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
-        p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+        p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf,
+                                                          0);
        if (!p_in || !p_out) {
                v4l2_err(&pcdev->v4l2_dev,
                         "Acquiring kernel pointers to buffers failed\n");
@@ -849,8 +850,10 @@ static int deinterlace_buf_prepare(struct vb2_buffer *vb)
 static void deinterlace_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct deinterlace_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-        v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
+        v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
 }
 static struct vb2_ops deinterlace_qops = {
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 5e2b4df48b3c..1d95842e2071 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -201,18 +201,18 @@ struct mcam_dma_desc {
 /*
 * Our buffer type for working with videobuf2.  Note that the vb2
- * developers have decreed that struct vb2_buffer must be at the
+ * developers have decreed that struct vb2_v4l2_buffer must be at the
 * beginning of this structure.
 */
 struct mcam_vb_buffer {
-        struct vb2_buffer vb_buf;
+        struct vb2_v4l2_buffer vb_buf;
        struct list_head queue;
        struct mcam_dma_desc *dma_desc; /* Descriptor virtual address */
        dma_addr_t dma_desc_pa;         /* Descriptor physical address */
        int dma_desc_nent;              /* Number of mapped descriptors */
 };
-static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_buffer *vb)
+static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct mcam_vb_buffer, vb_buf);
 }
@@ -221,14 +221,14 @@ static inline struct mcam_vb_buffer *vb_to_mvb(struct vb2_buffer *vb)
 * Hand a completed buffer back to user space.
 */
 static void mcam_buffer_done(struct mcam_camera *cam, int frame,
-                struct vb2_buffer *vbuf)
+                struct vb2_v4l2_buffer *vbuf)
 {
-        vbuf->v4l2_buf.bytesused = cam->pix_format.sizeimage;
+        vbuf->vb2_buf.planes[0].bytesused = cam->pix_format.sizeimage;
-        vbuf->v4l2_buf.sequence = cam->buf_seq[frame];
+        vbuf->sequence = cam->buf_seq[frame];
-        vbuf->v4l2_buf.field = V4L2_FIELD_NONE;
+        vbuf->field = V4L2_FIELD_NONE;
-        v4l2_get_timestamp(&vbuf->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vbuf->timestamp);
-        vb2_set_plane_payload(vbuf, 0, cam->pix_format.sizeimage);
+        vb2_set_plane_payload(&vbuf->vb2_buf, 0, cam->pix_format.sizeimage);
-        vb2_buffer_done(vbuf, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
 }
@@ -482,7 +482,8 @@ static void mcam_frame_tasklet(unsigned long data)
                 * Drop the lock during the big copy.  This *should* be safe...
                 */
                spin_unlock_irqrestore(&cam->dev_lock, flags);
-                memcpy(vb2_plane_vaddr(&buf->vb_buf, 0), cam->dma_bufs[bufno],
+                memcpy(vb2_plane_vaddr(&buf->vb_buf.vb2_buf, 0),
+                                cam->dma_bufs[bufno],
                                cam->pix_format.sizeimage);
                mcam_buffer_done(cam, bufno, &buf->vb_buf);
                spin_lock_irqsave(&cam->dev_lock, flags);
@@ -548,7 +549,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame)
 {
        struct mcam_vb_buffer *buf;
        dma_addr_t dma_handle;
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vb;
        /*
         * If there are no available buffers, go into single mode
@@ -570,7 +571,7 @@ static void mcam_set_contig_buffer(struct mcam_camera *cam, int frame)
        cam->vb_bufs[frame] = buf;
        vb = &buf->vb_buf;
-        dma_handle = vb2_dma_contig_plane_dma_addr(vb, 0);
+        dma_handle = vb2_dma_contig_plane_dma_addr(&vb->vb2_buf, 0);
        mcam_write_yuv_bases(cam, frame, dma_handle);
 }
@@ -1071,7 +1072,8 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
 static void mcam_vb_buf_queue(struct vb2_buffer *vb)
 {
-        struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
        unsigned long flags;
        int start;
@@ -1096,14 +1098,14 @@ static void mcam_vb_requeue_bufs(struct vb2_queue *vq,
        spin_lock_irqsave(&cam->dev_lock, flags);
        list_for_each_entry_safe(buf, node, &cam->buffers, queue) {
-                vb2_buffer_done(&buf->vb_buf, state);
+                vb2_buffer_done(&buf->vb_buf.vb2_buf, state);
                list_del(&buf->queue);
        }
        for (i = 0; i < MAX_DMA_BUFS; i++) {
                buf = cam->vb_bufs[i];
                if (buf) {
-                        vb2_buffer_done(&buf->vb_buf, state);
+                        vb2_buffer_done(&buf->vb_buf.vb2_buf, state);
                        cam->vb_bufs[i] = NULL;
                }
        }
@@ -1198,7 +1200,8 @@ static const struct vb2_ops mcam_vb2_ops = {
 */
 static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
 {
-        struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
        int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
@@ -1214,7 +1217,8 @@ static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
 static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 {
-        struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
        struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
        struct mcam_dma_desc *desc = mvb->dma_desc;
        struct scatterlist *sg;
@@ -1230,8 +1234,9 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
-        struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
+        struct mcam_vb_buffer *mvb = vb_to_mvb(vbuf);
        int ndesc = cam->pix_format.sizeimage/PAGE_SIZE + 1;
        dma_free_coherent(cam->dev, ndesc * sizeof(struct mcam_dma_desc),
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 87314b743f55..b7cea274d7ea 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -351,7 +351,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
 {
        struct emmaprp_dev *pcdev = data;
        struct emmaprp_ctx *curr_ctx;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        unsigned long flags;
        u32 irqst;
@@ -375,13 +375,13 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
                        src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
                        dst_vb = v4l2_m2m_dst_buf_remove(curr_ctx->m2m_ctx);
-                        dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+                        dst_vb->timestamp = src_vb->timestamp;
-                        dst_vb->v4l2_buf.flags &=
+                        dst_vb->flags &=
                                ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                        dst_vb->v4l2_buf.flags |=
+                        dst_vb->flags |=
-                                src_vb->v4l2_buf.flags
+                                src_vb->flags
                                & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                        dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
+                        dst_vb->timecode = src_vb->timecode;
                        spin_lock_irqsave(&pcdev->irqlock, flags);
                        v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
@@ -742,8 +742,9 @@ static int emmaprp_buf_prepare(struct vb2_buffer *vb)
 static void emmaprp_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct emmaprp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-        v4l2_m2m_buf_queue(ctx->m2m_ctx, vb);
+        v4l2_m2m_buf_queue(ctx->m2m_ctx, vbuf);
 }
 static struct vb2_ops emmaprp_qops = {
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index 41bb8df91f72..786cc8593f94 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -342,8 +342,9 @@ static int isp_video_queue_setup(struct vb2_queue *queue,
 static int isp_video_buffer_prepare(struct vb2_buffer *buf)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(buf);
        struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue);
-        struct isp_buffer *buffer = to_isp_buffer(buf);
+        struct isp_buffer *buffer = to_isp_buffer(vbuf);
        struct isp_video *video = vfh->video;
        dma_addr_t addr;
@@ -363,7 +364,8 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf)
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buffer->vb, 0, vfh->format.fmt.pix.sizeimage);
+        vb2_set_plane_payload(&buffer->vb.vb2_buf, 0,
+                              vfh->format.fmt.pix.sizeimage);
        buffer->dma = addr;
        return 0;
@@ -380,8 +382,9 @@ static int isp_video_buffer_prepare(struct vb2_buffer *buf)
 */
 static void isp_video_buffer_queue(struct vb2_buffer *buf)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(buf);
        struct isp_video_fh *vfh = vb2_get_drv_priv(buf->vb2_queue);
-        struct isp_buffer *buffer = to_isp_buffer(buf);
+        struct isp_buffer *buffer = to_isp_buffer(vbuf);
        struct isp_video *video = vfh->video;
        struct isp_pipeline *pipe = to_isp_pipeline(&video->video.entity);
        enum isp_pipeline_state state;
@@ -392,7 +395,7 @@ static void isp_video_buffer_queue(struct vb2_buffer *buf)
        spin_lock_irqsave(&video->irqlock, flags);
        if (unlikely(video->error)) {
-                vb2_buffer_done(&buffer->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buffer->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                spin_unlock_irqrestore(&video->irqlock, flags);
                return;
        }
@@ -464,7 +467,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
        list_del(&buf->irqlist);
        spin_unlock_irqrestore(&video->irqlock, flags);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
        /* Do frame number propagation only if this is the output video node.
         * Frame number either comes from the CSI receivers or it gets
@@ -473,15 +476,15 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
         * first, so the input number might lag behind by 1 in some cases.
         */
        if (video == pipe->output && !pipe->do_propagation)
-                buf->vb.v4l2_buf.sequence =
+                buf->vb.sequence =
                        atomic_inc_return(&pipe->frame_number);
        else
-                buf->vb.v4l2_buf.sequence = atomic_read(&pipe->frame_number);
+                buf->vb.sequence = atomic_read(&pipe->frame_number);
        if (pipe->field != V4L2_FIELD_NONE)
-                buf->vb.v4l2_buf.sequence /= 2;
+                buf->vb.sequence /= 2;
-        buf->vb.v4l2_buf.field = pipe->field;
+        buf->vb.field = pipe->field;
        /* Report pipeline errors to userspace on the capture device side. */
        if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE && pipe->error) {
@@ -491,7 +494,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video)
                state = VB2_BUF_STATE_DONE;
        }
-        vb2_buffer_done(&buf->vb, state);
+        vb2_buffer_done(&buf->vb.vb2_buf, state);
        spin_lock_irqsave(&video->irqlock, flags);
@@ -546,7 +549,7 @@ void omap3isp_video_cancel_stream(struct isp_video *video)
                buf = list_first_entry(&video->dmaqueue,
                                       struct isp_buffer, irqlist);
                list_del(&buf->irqlist);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        video->error = true;
diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h
index 31c2445f9eb2..bcf0e0acc8f3 100644
--- a/drivers/media/platform/omap3isp/ispvideo.h
+++ b/drivers/media/platform/omap3isp/ispvideo.h
@@ -122,7 +122,7 @@ static inline int isp_pipeline_ready(struct isp_pipeline *pipe)
 * @dma: DMA address
 */
 struct isp_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head irqlist;
        dma_addr_t dma;
 };
diff --git a/drivers/media/platform/rcar_jpu.c b/drivers/media/platform/rcar_jpu.c
index 18e62d06797c..7533b9e16649 100644
--- a/drivers/media/platform/rcar_jpu.c
+++ b/drivers/media/platform/rcar_jpu.c
@@ -471,7 +471,7 @@ static const char *error_to_text[16] = {
        "Unknown"
 };
-static struct jpu_buffer *vb2_to_jpu_buffer(struct vb2_buffer *vb)
+static struct jpu_buffer *vb2_to_jpu_buffer(struct vb2_v4l2_buffer *vb)
 {
        struct v4l2_m2m_buffer *b =
                container_of(vb, struct v4l2_m2m_buffer, vb);
@@ -1044,6 +1044,7 @@ static int jpu_queue_setup(struct vb2_queue *vq,
 static int jpu_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct jpu_q_data *q_data;
        unsigned int i;
@@ -1051,9 +1052,9 @@ static int jpu_buf_prepare(struct vb2_buffer *vb)
        q_data = jpu_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)
+                if (vbuf->field == V4L2_FIELD_ANY)
-                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                        vbuf->field = V4L2_FIELD_NONE;
-                if (vb->v4l2_buf.field != V4L2_FIELD_NONE) {
+                if (vbuf->field != V4L2_FIELD_NONE) {
                        dev_err(ctx->jpu->dev, "%s field isn't supported\n",
                                        __func__);
                        return -EINVAL;
@@ -1080,10 +1081,11 @@ static int jpu_buf_prepare(struct vb2_buffer *vb)
 static void jpu_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        if (!ctx->encoder && V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
-                struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vb);
+                struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vbuf);
                struct jpu_q_data *q_data, adjust;
                void *buffer = vb2_plane_vaddr(vb, 0);
                unsigned long buf_size = vb2_get_plane_payload(vb, 0);
@@ -1117,7 +1119,7 @@ static void jpu_buf_queue(struct vb2_buffer *vb)
        }
        if (ctx->fh.m2m_ctx)
-                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
        return;
@@ -1128,14 +1130,15 @@ format_error:
 static void jpu_buf_finish(struct vb2_buffer *vb)
 {
-        struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct jpu_buffer *jpu_buf = vb2_to_jpu_buffer(vbuf);
        struct jpu_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct jpu_q_data *q_data = &ctx->out_q;
        enum v4l2_buf_type type = vb->vb2_queue->type;
        u8 *buffer;
        if (vb->state == VB2_BUF_STATE_DONE)
-                vb->v4l2_buf.sequence = jpu_get_q_data(ctx, type)->sequence++;
+                vbuf->sequence = jpu_get_q_data(ctx, type)->sequence++;
        if (!ctx->encoder || vb->state != VB2_BUF_STATE_DONE ||
            V4L2_TYPE_IS_OUTPUT(type))
@@ -1163,7 +1166,7 @@ static int jpu_start_streaming(struct vb2_queue *vq, unsigned count)
 static void jpu_stop_streaming(struct vb2_queue *vq)
 {
        struct jpu_ctx *ctx = vb2_get_drv_priv(vq);
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vb;
        unsigned long flags;
        for (;;) {
@@ -1327,7 +1330,7 @@ static const struct v4l2_file_operations jpu_fops = {
 static void jpu_cleanup(struct jpu_ctx *ctx, bool reset)
 {
        /* remove current buffers and finish job */
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        unsigned long flags;
        spin_lock_irqsave(&ctx->jpu->lock, flags);
@@ -1353,7 +1356,7 @@ static void jpu_device_run(void *priv)
        struct jpu *jpu = ctx->jpu;
        struct jpu_buffer *jpu_buf;
        struct jpu_q_data *q_data;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        unsigned int w, h, bpl;
        unsigned char num_planes, subsampling;
        unsigned long flags;
@@ -1389,10 +1392,12 @@ static void jpu_device_run(void *priv)
                unsigned long src_1_addr, src_2_addr, dst_addr;
                unsigned int redu, inft;
-                dst_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+                dst_addr = vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
-                src_1_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+                src_1_addr =
+                        vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
                if (num_planes > 1)
-                        src_2_addr = vb2_dma_contig_plane_dma_addr(src_buf, 1);
+                        src_2_addr = vb2_dma_contig_plane_dma_addr(
+                                        &src_buf->vb2_buf, 1);
                else
                        src_2_addr = src_1_addr + w * h;
@@ -1453,10 +1458,12 @@ static void jpu_device_run(void *priv)
                        return;
                }
-                src_addr = vb2_dma_contig_plane_dma_addr(src_buf, 0);
+                src_addr = vb2_dma_contig_plane_dma_addr(&src_buf->vb2_buf, 0);
-                dst_1_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
+                dst_1_addr =
+                        vb2_dma_contig_plane_dma_addr(&dst_buf->vb2_buf, 0);
                if (q_data->fmtinfo->num_planes > 1)
-                        dst_2_addr = vb2_dma_contig_plane_dma_addr(dst_buf, 1);
+                        dst_2_addr = vb2_dma_contig_plane_dma_addr(
+                                        &dst_buf->vb2_buf, 1);
                else
                        dst_2_addr = dst_1_addr + w * h;
@@ -1511,7 +1518,7 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id)
 {
        struct jpu *jpu = dev_id;
        struct jpu_ctx *curr_ctx;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        unsigned int int_status;
        int_status = jpu_read(jpu, JINTS);
@@ -1547,18 +1554,18 @@ static irqreturn_t jpu_irq_handler(int irq, void *dev_id)
                        unsigned long payload_size = jpu_read(jpu, JCDTCU) << 16
                                                   | jpu_read(jpu, JCDTCM) << 8
                                                   | jpu_read(jpu, JCDTCD);
-                        vb2_set_plane_payload(dst_buf, 0,
+                        vb2_set_plane_payload(&dst_buf->vb2_buf, 0,
                                payload_size + JPU_JPEG_HDR_SIZE);
                }
-                dst_buf->v4l2_buf.field = src_buf->v4l2_buf.field;
+                dst_buf->field = src_buf->field;
-                dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
+                dst_buf->timestamp = src_buf->timestamp;
-                if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE)
+                if (src_buf->flags & V4L2_BUF_FLAG_TIMECODE)
-                        dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
+                        dst_buf->timecode = src_buf->timecode;
-                dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                dst_buf->v4l2_buf.flags |= src_buf->v4l2_buf.flags &
+                dst_buf->flags |= src_buf->flags &
                                        V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                dst_buf->v4l2_buf.flags = src_buf->v4l2_buf.flags &
+                dst_buf->flags = src_buf->flags &
                        (V4L2_BUF_FLAG_TIMECODE | V4L2_BUF_FLAG_KEYFRAME |
                         V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME |
                         V4L2_BUF_FLAG_TSTAMP_SRC_MASK);
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index bb86cf9b367f..5666766e2b87 100644
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -164,12 +164,12 @@ static int camif_reinitialize(struct camif_vp *vp)
        /* Release unused buffers */
        while (!list_empty(&vp->pending_buf_q)) {
                buf = camif_pending_queue_pop(vp);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        while (!list_empty(&vp->active_buf_q)) {
                buf = camif_active_queue_pop(vp);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&camif->slock, flags);
@@ -338,9 +338,9 @@ irqreturn_t s3c_camif_irq_handler(int irq, void *priv)
                if (!WARN_ON(vbuf == NULL)) {
                        /* Dequeue a filled buffer */
-                        v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp);
+                        v4l2_get_timestamp(&vbuf->vb.timestamp);
-                        vbuf->vb.v4l2_buf.sequence = vp->frame_sequence++;
+                        vbuf->vb.sequence = vp->frame_sequence++;
-                        vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE);
+                        vb2_buffer_done(&vbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                        /* Set up an empty buffer at the DMA engine */
                        vbuf = camif_pending_queue_pop(vp);
@@ -490,13 +490,14 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
-        struct camif_buffer *buf = container_of(vb, struct camif_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct camif_buffer *buf = container_of(vbuf, struct camif_buffer, vb);
        struct camif_vp *vp = vb2_get_drv_priv(vb->vb2_queue);
        struct camif_dev *camif = vp->camif;
        unsigned long flags;
        spin_lock_irqsave(&camif->slock, flags);
-        WARN_ON(camif_prepare_addr(vp, &buf->vb, &buf->paddr));
+        WARN_ON(camif_prepare_addr(vp, &buf->vb.vb2_buf, &buf->paddr));
        if (!(vp->state & ST_VP_STREAMING) && vp->active_buffers < 2) {
                /* Schedule an empty buffer in H/W */
diff --git a/drivers/media/platform/s3c-camif/camif-core.h b/drivers/media/platform/s3c-camif/camif-core.h
index 8ef6f26187dd..adaf1969ef63 100644
--- a/drivers/media/platform/s3c-camif/camif-core.h
+++ b/drivers/media/platform/s3c-camif/camif-core.h
@@ -322,7 +322,7 @@ struct camif_addr {
 * @index: an identifier of this buffer at the DMA engine
 */
 struct camif_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        struct camif_addr paddr;
        unsigned int index;
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 81483da2464b..4db507ab6777 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -134,8 +134,9 @@ static int g2d_buf_prepare(struct vb2_buffer *vb)
 static void g2d_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct g2d_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 struct vb2_ops g2d_qops = {
@@ -537,7 +538,7 @@ static irqreturn_t g2d_isr(int irq, void *prv)
 {
        struct g2d_dev *dev = prv;
        struct g2d_ctx *ctx = dev->curr;
-        struct vb2_buffer *src, *dst;
+        struct vb2_v4l2_buffer *src, *dst;
        g2d_clear_int(dev);
        clk_disable(dev->gate);
@@ -550,11 +551,11 @@ static irqreturn_t g2d_isr(int irq, void *prv)
        BUG_ON(src == NULL);
        BUG_ON(dst == NULL);
-        dst->v4l2_buf.timecode = src->v4l2_buf.timecode;
+        dst->timecode = src->timecode;
-        dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp;
+        dst->timestamp = src->timestamp;
-        dst->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst->v4l2_buf.flags |=
+        dst->flags |=
-                src->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
        v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);
        v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE);
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 18e754d319cf..f026366dc185 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -2483,6 +2483,7 @@ static int s5p_jpeg_buf_prepare(struct vb2_buffer *vb)
 static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct s5p_jpeg_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        if (ctx->mode == S5P_JPEG_DECODE &&
@@ -2517,7 +2518,7 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
                q_data->h = tmp.h;
        }
-        v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+        v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
 }
 static int s5p_jpeg_start_streaming(struct vb2_queue *q, unsigned int count)
@@ -2588,7 +2589,7 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
 {
        struct s5p_jpeg *jpeg = dev_id;
        struct s5p_jpeg_ctx *curr_ctx;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        unsigned long payload_size = 0;
        enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
        bool enc_jpeg_too_large = false;
@@ -2622,15 +2623,15 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
                payload_size = s5p_jpeg_compressed_size(jpeg->regs);
        }
-        dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
+        dst_buf->timecode = src_buf->timecode;
-        dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
+        dst_buf->timestamp = src_buf->timestamp;
-        dst_buf->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst_buf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst_buf->v4l2_buf.flags |=
+        dst_buf->flags |=
-                src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src_buf->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
        v4l2_m2m_buf_done(src_buf, state);
        if (curr_ctx->mode == S5P_JPEG_ENCODE)
-                vb2_set_plane_payload(dst_buf, 0, payload_size);
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload_size);
        v4l2_m2m_buf_done(dst_buf, state);
        v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx);
@@ -2645,7 +2646,7 @@ static irqreturn_t s5p_jpeg_irq(int irq, void *dev_id)
 static irqreturn_t exynos4_jpeg_irq(int irq, void *priv)
 {
        unsigned int int_status;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        struct s5p_jpeg *jpeg = priv;
        struct s5p_jpeg_ctx *curr_ctx;
        unsigned long payload_size = 0;
@@ -2687,7 +2688,8 @@ static irqreturn_t exynos4_jpeg_irq(int irq, void *priv)
        if (jpeg->irq_ret == OK_ENC_OR_DEC) {
                if (curr_ctx->mode == S5P_JPEG_ENCODE) {
                        payload_size = exynos4_jpeg_get_stream_size(jpeg->regs);
-                        vb2_set_plane_payload(dst_vb, 0, payload_size);
+                        vb2_set_plane_payload(&dst_vb->vb2_buf,
+                                        0, payload_size);
                }
                v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
                v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);
@@ -2708,7 +2710,7 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id)
 {
        struct s5p_jpeg *jpeg = dev_id;
        struct s5p_jpeg_ctx *curr_ctx;
-        struct vb2_buffer *src_buf, *dst_buf;
+        struct vb2_v4l2_buffer *src_buf, *dst_buf;
        unsigned long payload_size = 0;
        enum vb2_buffer_state state = VB2_BUF_STATE_DONE;
        bool interrupt_timeout = false;
@@ -2752,12 +2754,12 @@ static irqreturn_t exynos3250_jpeg_irq(int irq, void *dev_id)
        src_buf = v4l2_m2m_src_buf_remove(curr_ctx->fh.m2m_ctx);
        dst_buf = v4l2_m2m_dst_buf_remove(curr_ctx->fh.m2m_ctx);
-        dst_buf->v4l2_buf.timecode = src_buf->v4l2_buf.timecode;
+        dst_buf->timecode = src_buf->timecode;
-        dst_buf->v4l2_buf.timestamp = src_buf->v4l2_buf.timestamp;
+        dst_buf->timestamp = src_buf->timestamp;
        v4l2_m2m_buf_done(src_buf, state);
        if (curr_ctx->mode == S5P_JPEG_ENCODE)
-                vb2_set_plane_payload(dst_buf, 0, payload_size);
+                vb2_set_plane_payload(&dst_buf->vb2_buf, 0, payload_size);
        v4l2_m2m_buf_done(dst_buf, state);
        v4l2_m2m_job_finish(jpeg->m2m_dev, curr_ctx->fh.m2m_ctx);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index b3758b8a3c1d..7b646c2e51cd 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -199,22 +199,22 @@ static void s5p_mfc_handle_frame_all_extracted(struct s5p_mfc_ctx *ctx)
                dst_buf = list_entry(ctx->dst_queue.next,
                                     struct s5p_mfc_buf, list);
                mfc_debug(2, "Cleaning up buffer: %d\n",
-                                          dst_buf->b->v4l2_buf.index);
+                                          dst_buf->b->vb2_buf.index);
-                vb2_set_plane_payload(dst_buf->b, 0, 0);
+                vb2_set_plane_payload(&dst_buf->b->vb2_buf, 0, 0);
-                vb2_set_plane_payload(dst_buf->b, 1, 0);
+                vb2_set_plane_payload(&dst_buf->b->vb2_buf, 1, 0);
                list_del(&dst_buf->list);
                ctx->dst_queue_cnt--;
-                dst_buf->b->v4l2_buf.sequence = (ctx->sequence++);
+                dst_buf->b->sequence = (ctx->sequence++);
                if (s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_top, ctx) ==
                        s5p_mfc_hw_call(dev->mfc_ops, get_pic_type_bot, ctx))
-                        dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE;
+                        dst_buf->b->field = V4L2_FIELD_NONE;
                else
-                        dst_buf->b->v4l2_buf.field = V4L2_FIELD_INTERLACED;
+                        dst_buf->b->field = V4L2_FIELD_INTERLACED;
-                dst_buf->b->v4l2_buf.flags |= V4L2_BUF_FLAG_LAST;
+                dst_buf->b->flags |= V4L2_BUF_FLAG_LAST;
-                ctx->dec_dst_flag &= ~(1 << dst_buf->b->v4l2_buf.index);
+                ctx->dec_dst_flag &= ~(1 << dst_buf->b->vb2_buf.index);
-                vb2_buffer_done(dst_buf->b, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&dst_buf->b->vb2_buf, VB2_BUF_STATE_DONE);
        }
 }
@@ -235,27 +235,28 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
           appropriate flags. */
        src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
        list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
-                if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) {
+                if (vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0)
-                        dst_buf->b->v4l2_buf.timecode =
+                                == dec_y_addr) {
-                                                src_buf->b->v4l2_buf.timecode;
+                        dst_buf->b->timecode =
-                        dst_buf->b->v4l2_buf.timestamp =
+                                                src_buf->b->timecode;
-                                                src_buf->b->v4l2_buf.timestamp;
+                        dst_buf->b->timestamp =
-                        dst_buf->b->v4l2_buf.flags &=
+                                                src_buf->b->timestamp;
+                        dst_buf->b->flags &=
                                ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                        dst_buf->b->v4l2_buf.flags |=
+                        dst_buf->b->flags |=
-                                src_buf->b->v4l2_buf.flags
+                                src_buf->b->flags
                                & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
                        switch (frame_type) {
                        case S5P_FIMV_DECODE_FRAME_I_FRAME:
-                                dst_buf->b->v4l2_buf.flags |=
+                                dst_buf->b->flags |=
                                                V4L2_BUF_FLAG_KEYFRAME;
                                break;
                        case S5P_FIMV_DECODE_FRAME_P_FRAME:
-                                dst_buf->b->v4l2_buf.flags |=
+                                dst_buf->b->flags |=
                                                V4L2_BUF_FLAG_PFRAME;
                                break;
                        case S5P_FIMV_DECODE_FRAME_B_FRAME:
-                                dst_buf->b->v4l2_buf.flags |=
+                                dst_buf->b->flags |=
                                                V4L2_BUF_FLAG_BFRAME;
                                break;
                        default:
@@ -296,25 +297,28 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
         * check which videobuf does it correspond to */
        list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
                /* Check if this is the buffer we're looking for */
-                if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dspl_y_addr) {
+                if (vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0)
+                                == dspl_y_addr) {
                        list_del(&dst_buf->list);
                        ctx->dst_queue_cnt--;
-                        dst_buf->b->v4l2_buf.sequence = ctx->sequence;
+                        dst_buf->b->sequence = ctx->sequence;
                        if (s5p_mfc_hw_call(dev->mfc_ops,
                                        get_pic_type_top, ctx) ==
                                s5p_mfc_hw_call(dev->mfc_ops,
                                        get_pic_type_bot, ctx))
-                                dst_buf->b->v4l2_buf.field = V4L2_FIELD_NONE;
+                                dst_buf->b->field = V4L2_FIELD_NONE;
                        else
-                                dst_buf->b->v4l2_buf.field =
+                                dst_buf->b->field =
                                                        V4L2_FIELD_INTERLACED;
-                        vb2_set_plane_payload(dst_buf->b, 0, ctx->luma_size);
+                        vb2_set_plane_payload(&dst_buf->b->vb2_buf, 0,
-                        vb2_set_plane_payload(dst_buf->b, 1, ctx->chroma_size);
+                                                ctx->luma_size);
-                        clear_bit(dst_buf->b->v4l2_buf.index,
+                        vb2_set_plane_payload(&dst_buf->b->vb2_buf, 1,
+                                                ctx->chroma_size);
+                        clear_bit(dst_buf->b->vb2_buf.index,
                                                        &ctx->dec_dst_flag);
-                        vb2_buffer_done(dst_buf->b,
+                        vb2_buffer_done(&dst_buf->b->vb2_buf, err ?
-                                err ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
+                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                        break;
                }
@@ -395,7 +399,7 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
                if (ctx->codec_mode != S5P_MFC_CODEC_H264_DEC &&
                        ctx->codec_mode != S5P_MFC_CODEC_VP8_DEC &&
                        ctx->consumed_stream + STUFF_BYTE <
-                        src_buf->b->v4l2_planes[0].bytesused) {
+                        src_buf->b->vb2_buf.planes[0].bytesused) {
                        /* Run MFC again on the same buffer */
                        mfc_debug(2, "Running again the same buffer\n");
                        ctx->after_packed_pb = 1;
@@ -407,9 +411,11 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
                        list_del(&src_buf->list);
                        ctx->src_queue_cnt--;
                        if (s5p_mfc_hw_call(dev->mfc_ops, err_dec, err) > 0)
-                                vb2_buffer_done(src_buf->b, VB2_BUF_STATE_ERROR);
+                                vb2_buffer_done(&src_buf->b->vb2_buf,
+                                                VB2_BUF_STATE_ERROR);
                        else
-                                vb2_buffer_done(src_buf->b, VB2_BUF_STATE_DONE);
+                                vb2_buffer_done(&src_buf->b->vb2_buf,
+                                                VB2_BUF_STATE_DONE);
                }
        }
 leave_handle_frame:
@@ -510,7 +516,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,
                                        struct s5p_mfc_buf, list);
                        if (s5p_mfc_hw_call(dev->mfc_ops, get_consumed_stream,
                                                dev) <
-                                        src_buf->b->v4l2_planes[0].bytesused)
+                                        src_buf->b->vb2_buf.planes[0].bytesused)
                                ctx->head_processed = 0;
                        else
                                ctx->head_processed = 1;
@@ -551,7 +557,7 @@ static void s5p_mfc_handle_init_buffers(struct s5p_mfc_ctx *ctx,
                                             struct s5p_mfc_buf, list);
                                list_del(&src_buf->list);
                                ctx->src_queue_cnt--;
-                                vb2_buffer_done(src_buf->b,
+                                vb2_buffer_done(&src_buf->b->vb2_buf,
                                                VB2_BUF_STATE_DONE);
                        }
                        spin_unlock_irqrestore(&dev->irqlock, flags);
@@ -592,8 +598,8 @@ static void s5p_mfc_handle_stream_complete(struct s5p_mfc_ctx *ctx,
                                                                        list);
                list_del(&mb_entry->list);
                ctx->dst_queue_cnt--;
-                vb2_set_plane_payload(mb_entry->b, 0, 0);
+                vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, 0);
-                vb2_buffer_done(mb_entry->b, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE);
        }
        spin_unlock(&dev->irqlock);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 10884a77f79f..d1a3f9b1bc44 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -179,8 +179,8 @@ struct s5p_mfc_ctx;
 * struct s5p_mfc_buf - MFC buffer
 */
 struct s5p_mfc_buf {
+        struct vb2_v4l2_buffer *b;
        struct list_head list;
-        struct vb2_buffer *b;
        union {
                struct {
                        size_t luma;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 2fd59e7c70c2..1734775a63e6 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -945,6 +945,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
 static int s5p_mfc_buf_init(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
        unsigned int i;
@@ -964,8 +965,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
                        mfc_err("Plane buffer (CAPTURE) is too small\n");
                        return -EINVAL;
                }
-                i = vb->v4l2_buf.index;
+                i = vb->index;
-                ctx->dst_bufs[i].b = vb;
+                ctx->dst_bufs[i].b = vbuf;
                ctx->dst_bufs[i].cookie.raw.luma =
                                        vb2_dma_contig_plane_dma_addr(vb, 0);
                ctx->dst_bufs[i].cookie.raw.chroma =
@@ -982,8 +983,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
                        return -EINVAL;
                }
-                i = vb->v4l2_buf.index;
+                i = vb->index;
-                ctx->src_bufs[i].b = vb;
+                ctx->src_bufs[i].b = vbuf;
                ctx->src_bufs[i].cookie.stream =
                                        vb2_dma_contig_plane_dma_addr(vb, 0);
                ctx->src_bufs_cnt++;
@@ -1065,18 +1066,18 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
        struct s5p_mfc_buf *mfc_buf;
        if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-                mfc_buf = &ctx->src_bufs[vb->v4l2_buf.index];
+                mfc_buf = &ctx->src_bufs[vb->index];
                mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
                spin_lock_irqsave(&dev->irqlock, flags);
                list_add_tail(&mfc_buf->list, &ctx->src_queue);
                ctx->src_queue_cnt++;
                spin_unlock_irqrestore(&dev->irqlock, flags);
        } else if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
-                mfc_buf = &ctx->dst_bufs[vb->v4l2_buf.index];
+                mfc_buf = &ctx->dst_bufs[vb->index];
                mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
                /* Mark destination as available for use by MFC */
                spin_lock_irqsave(&dev->irqlock, flags);
-                set_bit(vb->v4l2_buf.index, &ctx->dec_dst_flag);
+                set_bit(vb->index, &ctx->dec_dst_flag);
                list_add_tail(&mfc_buf->list, &ctx->dst_queue);
                ctx->dst_queue_cnt++;
                spin_unlock_irqrestore(&dev->irqlock, flags);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index e42014c1ceca..94868f7214da 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -773,8 +773,8 @@ static int enc_pre_seq_start(struct s5p_mfc_ctx *ctx)
        spin_lock_irqsave(&dev->irqlock, flags);
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr,
                        dst_size);
        spin_unlock_irqrestore(&dev->irqlock, flags);
@@ -796,10 +796,11 @@ static int enc_post_seq_start(struct s5p_mfc_ctx *ctx)
                                        struct s5p_mfc_buf, list);
                        list_del(&dst_mb->list);
                        ctx->dst_queue_cnt--;
-                        vb2_set_plane_payload(dst_mb->b, 0,
+                        vb2_set_plane_payload(&dst_mb->b->vb2_buf, 0,
                                s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size,
                                                dev));
-                        vb2_buffer_done(dst_mb->b, VB2_BUF_STATE_DONE);
+                        vb2_buffer_done(&dst_mb->b->vb2_buf,
+                                        VB2_BUF_STATE_DONE);
                }
                spin_unlock_irqrestore(&dev->irqlock, flags);
        }
@@ -831,16 +832,16 @@ static int enc_pre_frame_start(struct s5p_mfc_ctx *ctx)
        spin_lock_irqsave(&dev->irqlock, flags);
        src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
-        src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 0);
+        src_y_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 0);
-        src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 1);
+        src_c_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 1);
        s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_frame_buffer, ctx,
                                                        src_y_addr, src_c_addr);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        spin_lock_irqsave(&dev->irqlock, flags);
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_hw_call_void(dev->mfc_ops, set_enc_stream_buffer, ctx, dst_addr,
                        dst_size);
        spin_unlock_irqrestore(&dev->irqlock, flags);
@@ -869,25 +870,29 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
                s5p_mfc_hw_call_void(dev->mfc_ops, get_enc_frame_buffer, ctx,
                                &enc_y_addr, &enc_c_addr);
                list_for_each_entry(mb_entry, &ctx->src_queue, list) {
-                        mb_y_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 0);
+                        mb_y_addr = vb2_dma_contig_plane_dma_addr(
-                        mb_c_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 1);
+                                        &mb_entry->b->vb2_buf, 0);
+                        mb_c_addr = vb2_dma_contig_plane_dma_addr(
+                                        &mb_entry->b->vb2_buf, 1);
                        if ((enc_y_addr == mb_y_addr) &&
                                                (enc_c_addr == mb_c_addr)) {
                                list_del(&mb_entry->list);
                                ctx->src_queue_cnt--;
-                                vb2_buffer_done(mb_entry->b,
+                                vb2_buffer_done(&mb_entry->b->vb2_buf,
                                                        VB2_BUF_STATE_DONE);
                                break;
                        }
                }
                list_for_each_entry(mb_entry, &ctx->ref_queue, list) {
-                        mb_y_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 0);
+                        mb_y_addr = vb2_dma_contig_plane_dma_addr(
-                        mb_c_addr = vb2_dma_contig_plane_dma_addr(mb_entry->b, 1);
+                                        &mb_entry->b->vb2_buf, 0);
+                        mb_c_addr = vb2_dma_contig_plane_dma_addr(
+                                        &mb_entry->b->vb2_buf, 1);
                        if ((enc_y_addr == mb_y_addr) &&
                                                (enc_c_addr == mb_c_addr)) {
                                list_del(&mb_entry->list);
                                ctx->ref_queue_cnt--;
-                                vb2_buffer_done(mb_entry->b,
+                                vb2_buffer_done(&mb_entry->b->vb2_buf,
                                                        VB2_BUF_STATE_DONE);
                                break;
                        }
@@ -912,17 +917,17 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx)
                ctx->dst_queue_cnt--;
                switch (slice_type) {
                case S5P_FIMV_ENC_SI_SLICE_TYPE_I:
-                        mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
+                        mb_entry->b->flags |= V4L2_BUF_FLAG_KEYFRAME;
                        break;
                case S5P_FIMV_ENC_SI_SLICE_TYPE_P:
-                        mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_PFRAME;
+                        mb_entry->b->flags |= V4L2_BUF_FLAG_PFRAME;
                        break;
                case S5P_FIMV_ENC_SI_SLICE_TYPE_B:
-                        mb_entry->b->v4l2_buf.flags |= V4L2_BUF_FLAG_BFRAME;
+                        mb_entry->b->flags |= V4L2_BUF_FLAG_BFRAME;
                        break;
                }
-                vb2_set_plane_payload(mb_entry->b, 0, strm_size);
+                vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, strm_size);
-                vb2_buffer_done(mb_entry->b, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE);
        }
        spin_unlock_irqrestore(&dev->irqlock, flags);
        if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0))
@@ -1806,7 +1811,7 @@ static int check_vb_with_fmt(struct s5p_mfc_fmt *fmt, struct vb2_buffer *vb)
                        return -EINVAL;
                }
                mfc_debug(2, "index: %d, plane[%d] cookie: %pad\n",
-                          vb->v4l2_buf.index, i, &dma);
+                          vb->index, i, &dma);
        }
        return 0;
 }
@@ -1869,6 +1874,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
 static int s5p_mfc_buf_init(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *vq = vb->vb2_queue;
        struct s5p_mfc_ctx *ctx = fh_to_ctx(vq->drv_priv);
        unsigned int i;
@@ -1878,8 +1884,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
                ret = check_vb_with_fmt(ctx->dst_fmt, vb);
                if (ret < 0)
                        return ret;
-                i = vb->v4l2_buf.index;
+                i = vb->index;
-                ctx->dst_bufs[i].b = vb;
+                ctx->dst_bufs[i].b = vbuf;
                ctx->dst_bufs[i].cookie.stream =
                                        vb2_dma_contig_plane_dma_addr(vb, 0);
                ctx->dst_bufs_cnt++;
@@ -1887,8 +1893,8 @@ static int s5p_mfc_buf_init(struct vb2_buffer *vb)
                ret = check_vb_with_fmt(ctx->src_fmt, vb);
                if (ret < 0)
                        return ret;
-                i = vb->v4l2_buf.index;
+                i = vb->index;
-                ctx->src_bufs[i].b = vb;
+                ctx->src_bufs[i].b = vbuf;
                ctx->src_bufs[i].cookie.raw.luma =
                                        vb2_dma_contig_plane_dma_addr(vb, 0);
                ctx->src_bufs[i].cookie.raw.chroma =
@@ -2012,7 +2018,7 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
                return;
        }
        if (vq->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
-                mfc_buf = &ctx->dst_bufs[vb->v4l2_buf.index];
+                mfc_buf = &ctx->dst_bufs[vb->index];
                mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
                /* Mark destination as available for use by MFC */
                spin_lock_irqsave(&dev->irqlock, flags);
@@ -2020,7 +2026,7 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
                ctx->dst_queue_cnt++;
                spin_unlock_irqrestore(&dev->irqlock, flags);
        } else if (vq->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
-                mfc_buf = &ctx->src_bufs[vb->v4l2_buf.index];
+                mfc_buf = &ctx->src_bufs[vb->index];
                mfc_buf->flags &= ~MFC_BUF_FLAG_USED;
                spin_lock_irqsave(&dev->irqlock, flags);
                list_add_tail(&mfc_buf->list, &ctx->src_queue);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 6402f76cc620..873c933bc7d4 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -1208,11 +1208,11 @@ static int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx, int last_frame)
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
        temp_vb->flags |= MFC_BUF_FLAG_USED;
        s5p_mfc_set_dec_stream_buffer_v5(ctx,
-                vb2_dma_contig_plane_dma_addr(temp_vb->b, 0),
+                vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
-                ctx->consumed_stream, temp_vb->b->v4l2_planes[0].bytesused);
+                ctx->consumed_stream, temp_vb->b->vb2_buf.planes[0].bytesused);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
-        if (temp_vb->b->v4l2_planes[0].bytesused == 0) {
+        if (temp_vb->b->vb2_buf.planes[0].bytesused == 0) {
                last_frame = MFC_DEC_LAST_FRAME;
                mfc_debug(2, "Setting ctx->state to FINISHING\n");
                ctx->state = MFCINST_FINISHING;
@@ -1249,16 +1249,16 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
                src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf,
                                                                        list);
                src_mb->flags |= MFC_BUF_FLAG_USED;
-                if (src_mb->b->v4l2_planes[0].bytesused == 0) {
+                if (src_mb->b->vb2_buf.planes[0].bytesused == 0) {
                        /* send null frame */
                        s5p_mfc_set_enc_frame_buffer_v5(ctx, dev->bank2,
                                                                dev->bank2);
                        ctx->state = MFCINST_FINISHING;
                } else {
-                        src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b,
+                        src_y_addr = vb2_dma_contig_plane_dma_addr(
-                                                                        0);
+                                        &src_mb->b->vb2_buf, 0);
-                        src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b,
+                        src_c_addr = vb2_dma_contig_plane_dma_addr(
-                                                                        1);
+                                        &src_mb->b->vb2_buf, 1);
                        s5p_mfc_set_enc_frame_buffer_v5(ctx, src_y_addr,
                                                                src_c_addr);
                        if (src_mb->flags & MFC_BUF_FLAG_EOS)
@@ -1267,13 +1267,13 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
        }
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
        dst_mb->flags |= MFC_BUF_FLAG_USED;
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
        mfc_debug(2, "encoding buffer with index=%d state=%d\n",
-                  src_mb ? src_mb->b->v4l2_buf.index : -1, ctx->state);
+                  src_mb ? src_mb->b->vb2_buf.index : -1, ctx->state);
        s5p_mfc_encode_one_frame_v5(ctx);
        return 0;
 }
@@ -1289,10 +1289,11 @@ static void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
        mfc_debug(2, "Preparing to init decoding\n");
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
        s5p_mfc_set_dec_desc_buffer(ctx);
-        mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused);
+        mfc_debug(2, "Header size: %d\n",
+                        temp_vb->b->vb2_buf.planes[0].bytesused);
        s5p_mfc_set_dec_stream_buffer_v5(ctx,
-                                vb2_dma_contig_plane_dma_addr(temp_vb->b, 0),
+                        vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
-                                0, temp_vb->b->v4l2_planes[0].bytesused);
+                        0, temp_vb->b->vb2_buf.planes[0].bytesused);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
        s5p_mfc_init_decode_v5(ctx);
@@ -1309,8 +1310,8 @@ static void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
        s5p_mfc_set_enc_ref_buffer_v5(ctx);
        spin_lock_irqsave(&dev->irqlock, flags);
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
@@ -1342,10 +1343,11 @@ static int s5p_mfc_run_init_dec_buffers(struct s5p_mfc_ctx *ctx)
                return -EIO;
        }
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
-        mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused);
+        mfc_debug(2, "Header size: %d\n",
+                        temp_vb->b->vb2_buf.planes[0].bytesused);
        s5p_mfc_set_dec_stream_buffer_v5(ctx,
-                                vb2_dma_contig_plane_dma_addr(temp_vb->b, 0),
+                        vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
-                                0, temp_vb->b->v4l2_planes[0].bytesused);
+                        0, temp_vb->b->vb2_buf.planes[0].bytesused);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
        ret = s5p_mfc_set_dec_frame_buffer_v5(ctx);
@@ -1478,9 +1480,9 @@ static void s5p_mfc_cleanup_queue_v5(struct list_head *lh, struct vb2_queue *vq)
        while (!list_empty(lh)) {
                b = list_entry(lh->next, struct s5p_mfc_buf, list);
-                for (i = 0; i < b->b->num_planes; i++)
+                for (i = 0; i < b->b->vb2_buf.num_planes; i++)
-                        vb2_set_plane_payload(b->b, i, 0);
+                        vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
-                vb2_buffer_done(b->b, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&b->list);
        }
 }
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 04f8c7b5a86f..e0924a5233c8 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1562,13 +1562,13 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
        temp_vb->flags |= MFC_BUF_FLAG_USED;
        s5p_mfc_set_dec_stream_buffer_v6(ctx,
-                vb2_dma_contig_plane_dma_addr(temp_vb->b, 0),
+                vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0),
-                        ctx->consumed_stream,
+                ctx->consumed_stream,
-                        temp_vb->b->v4l2_planes[0].bytesused);
+                temp_vb->b->vb2_buf.planes[0].bytesused);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
-        if (temp_vb->b->v4l2_planes[0].bytesused == 0) {
+        if (temp_vb->b->vb2_buf.planes[0].bytesused == 0) {
                last_frame = 1;
                mfc_debug(2, "Setting ctx->state to FINISHING\n");
                ctx->state = MFCINST_FINISHING;
@@ -1606,8 +1606,8 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
        src_mb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
        src_mb->flags |= MFC_BUF_FLAG_USED;
-        src_y_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 0);
+        src_y_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 0);
-        src_c_addr = vb2_dma_contig_plane_dma_addr(src_mb->b, 1);
+        src_c_addr = vb2_dma_contig_plane_dma_addr(&src_mb->b->vb2_buf, 1);
        mfc_debug(2, "enc src y addr: 0x%08lx\n", src_y_addr);
        mfc_debug(2, "enc src c addr: 0x%08lx\n", src_c_addr);
@@ -1616,8 +1616,8 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
        dst_mb->flags |= MFC_BUF_FLAG_USED;
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size);
@@ -1639,10 +1639,11 @@ static inline void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
        spin_lock_irqsave(&dev->irqlock, flags);
        mfc_debug(2, "Preparing to init decoding.\n");
        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
-        mfc_debug(2, "Header size: %d\n", temp_vb->b->v4l2_planes[0].bytesused);
+        mfc_debug(2, "Header size: %d\n",
+                temp_vb->b->vb2_buf.planes[0].bytesused);
        s5p_mfc_set_dec_stream_buffer_v6(ctx,
-                vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), 0,
+                vb2_dma_contig_plane_dma_addr(&temp_vb->b->vb2_buf, 0), 0,
-                        temp_vb->b->v4l2_planes[0].bytesused);
+                temp_vb->b->vb2_buf.planes[0].bytesused);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
        s5p_mfc_init_decode_v6(ctx);
@@ -1659,8 +1660,8 @@ static inline void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
        spin_lock_irqsave(&dev->irqlock, flags);
        dst_mb = list_entry(ctx->dst_queue.next, struct s5p_mfc_buf, list);
-        dst_addr = vb2_dma_contig_plane_dma_addr(dst_mb->b, 0);
+        dst_addr = vb2_dma_contig_plane_dma_addr(&dst_mb->b->vb2_buf, 0);
-        dst_size = vb2_plane_size(dst_mb->b, 0);
+        dst_size = vb2_plane_size(&dst_mb->b->vb2_buf, 0);
        s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size);
        spin_unlock_irqrestore(&dev->irqlock, flags);
        dev->curr_ctx = ctx->num;
@@ -1836,9 +1837,9 @@ static void s5p_mfc_cleanup_queue_v6(struct list_head *lh, struct vb2_queue *vq)
        while (!list_empty(lh)) {
                b = list_entry(lh->next, struct s5p_mfc_buf, list);
-                for (i = 0; i < b->b->num_planes; i++)
+                for (i = 0; i < b->b->vb2_buf.num_planes; i++)
-                        vb2_set_plane_payload(b->b, i, 0);
+                        vb2_set_plane_payload(&b->b->vb2_buf, i, 0);
-                vb2_buffer_done(b->b, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&b->b->vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&b->list);
        }
 }
diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
index 855b7238adaa..42cd2709c41c 100644
--- a/drivers/media/platform/s5p-tv/mixer.h
+++ b/drivers/media/platform/s5p-tv/mixer.h
@@ -113,7 +113,7 @@ struct mxr_geometry {
 /** instance of a buffer */
 struct mxr_buffer {
        /** common v4l buffer stuff -- must be first */
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        /** node for layer's lists */
        struct list_head        list;
 };
diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
index 74344c764daa..db3163b23ea0 100644
--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
@@ -86,7 +86,7 @@ static void mxr_graph_buffer_set(struct mxr_layer *layer,
        dma_addr_t addr = 0;
        if (buf)
-                addr = vb2_dma_contig_plane_dma_addr(&buf->vb, 0);
+                addr = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
        mxr_reg_graph_buffer(layer->mdev, layer->idx, addr);
 }
diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
index 5127acb1e571..a0ec14a1da13 100644
--- a/drivers/media/platform/s5p-tv/mixer_reg.c
+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
@@ -279,7 +279,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
        layer->ops.buffer_set(layer, layer->update_buf);
        if (done && done != layer->shadow_buf)
-                vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&done->vb.vb2_buf, VB2_BUF_STATE_DONE);
 done:
        spin_unlock(&layer->enq_slock);
diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 751f3b618337..dba92b54a588 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -914,7 +914,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *pfmt,
 static void buf_queue(struct vb2_buffer *vb)
 {
-        struct mxr_buffer *buffer = container_of(vb, struct mxr_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct mxr_buffer *buffer = container_of(vbuf, struct mxr_buffer, vb);
        struct mxr_layer *layer = vb2_get_drv_priv(vb->vb2_queue);
        struct mxr_device *mdev = layer->mdev;
        unsigned long flags;
@@ -963,11 +964,13 @@ static void mxr_watchdog(unsigned long arg)
        if (layer->update_buf == layer->shadow_buf)
                layer->update_buf = NULL;
        if (layer->update_buf) {
-                vb2_buffer_done(&layer->update_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&layer->update_buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
                layer->update_buf = NULL;
        }
        if (layer->shadow_buf) {
-                vb2_buffer_done(&layer->shadow_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&layer->shadow_buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
                layer->shadow_buf = NULL;
        }
        spin_unlock_irqrestore(&layer->enq_slock, flags);
@@ -991,7 +994,7 @@ static void stop_streaming(struct vb2_queue *vq)
        /* set all buffer to be done */
        list_for_each_entry_safe(buf, buf_tmp, &layer->enq_list, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&layer->enq_slock, flags);
diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
index c9388c45ad75..dd002a497dbb 100644
--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
@@ -97,9 +97,10 @@ static void mxr_vp_buffer_set(struct mxr_layer *layer,
                mxr_reg_vp_buffer(layer->mdev, luma_addr, chroma_addr);
                return;
        }
-        luma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 0);
+        luma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 0);
        if (layer->fmt->num_subframes == 2) {
-                chroma_addr[0] = vb2_dma_contig_plane_dma_addr(&buf->vb, 1);
+                chroma_addr[0] =
+                        vb2_dma_contig_plane_dma_addr(&buf->vb.vb2_buf, 1);
        } else {
                /* FIXME: mxr_get_plane_size compute integer division,
                 * which is slow and should not be performed in interrupt */
diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
index f5e3eb3a20ff..6455cb9b3224 100644
--- a/drivers/media/platform/sh_veu.c
+++ b/drivers/media/platform/sh_veu.c
@@ -931,9 +931,10 @@ static int sh_veu_buf_prepare(struct vb2_buffer *vb)
 static void sh_veu_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct sh_veu_dev *veu = vb2_get_drv_priv(vb->vb2_queue);
-        dev_dbg(veu->dev, "%s(%d)\n", __func__, vb->v4l2_buf.type);
+        dev_dbg(veu->dev, "%s(%d)\n", __func__, vb->type);
-        v4l2_m2m_buf_queue(veu->m2m_ctx, vb);
+        v4l2_m2m_buf_queue(veu->m2m_ctx, vbuf);
 }
 static const struct vb2_ops sh_veu_qops = {
@@ -1084,8 +1085,8 @@ static irqreturn_t sh_veu_bh(int irq, void *dev_id)
 static irqreturn_t sh_veu_isr(int irq, void *dev_id)
 {
        struct sh_veu_dev *veu = dev_id;
-        struct vb2_buffer *dst;
+        struct vb2_v4l2_buffer *dst;
-        struct vb2_buffer *src;
+        struct vb2_v4l2_buffer *src;
        u32 status = sh_veu_reg_read(veu, VEU_EVTR);
        /* bundle read mode not used */
@@ -1105,11 +1106,11 @@ static irqreturn_t sh_veu_isr(int irq, void *dev_id)
        if (!src || !dst)
                return IRQ_NONE;
-        dst->v4l2_buf.timestamp = src->v4l2_buf.timestamp;
+        dst->timestamp = src->timestamp;
-        dst->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+        dst->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst->v4l2_buf.flags |=
+        dst->flags |=
-                src->v4l2_buf.flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                src->flags & V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-        dst->v4l2_buf.timecode = src->v4l2_buf.timecode;
+        dst->timecode = src->timecode;
        spin_lock(&veu->lock);
        v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE);
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index fe5c8ab06bd5..7967a75fde36 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -27,6 +27,7 @@
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-mediabus.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 /* Mirror addresses are not available for all registers */
@@ -62,11 +63,12 @@ enum sh_vou_status {
 #define VOU_MIN_IMAGE_HEIGHT    16
 struct sh_vou_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
-static inline struct sh_vou_buffer *to_sh_vou_buffer(struct vb2_buffer *vb2)
+static inline struct
+sh_vou_buffer *to_sh_vou_buffer(struct vb2_v4l2_buffer *vb2)
 {
        return container_of(vb2, struct sh_vou_buffer, vb);
 }
@@ -193,11 +195,11 @@ static struct sh_vou_fmt vou_fmt[] = {
 };
 static void sh_vou_schedule_next(struct sh_vou_device *vou_dev,
-                                 struct vb2_buffer *vb)
+                                 struct vb2_v4l2_buffer *vbuf)
 {
        dma_addr_t addr1, addr2;
-        addr1 = vb2_dma_contig_plane_dma_addr(vb, 0);
+        addr1 = vb2_dma_contig_plane_dma_addr(&vbuf->vb2_buf, 0);
        switch (vou_dev->pix.pixelformat) {
        case V4L2_PIX_FMT_NV12:
        case V4L2_PIX_FMT_NV16:
@@ -282,8 +284,9 @@ static int sh_vou_buf_prepare(struct vb2_buffer *vb)
 /* Locking: caller holds fop_lock mutex and vq->irqlock spinlock */
 static void sh_vou_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct sh_vou_device *vou_dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vb);
+        struct sh_vou_buffer *shbuf = to_sh_vou_buffer(vbuf);
        unsigned long flags;
        spin_lock_irqsave(&vou_dev->lock, flags);
@@ -302,7 +305,8 @@ static int sh_vou_start_streaming(struct vb2_queue *vq, unsigned int count)
                                         video, s_stream, 1);
        if (ret < 0 && ret != -ENOIOCTLCMD) {
                list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                        list_del(&buf->list);
                }
                vou_dev->active = NULL;
@@ -353,7 +357,7 @@ static void sh_vou_stop_streaming(struct vb2_queue *vq)
        msleep(50);
        spin_lock_irqsave(&vou_dev->lock, flags);
        list_for_each_entry_safe(buf, node, &vou_dev->buf_list, list) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&buf->list);
        }
        vou_dev->active = NULL;
@@ -1066,10 +1070,10 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
        list_del(&vb->list);
-        v4l2_get_timestamp(&vb->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vb->vb.timestamp);
-        vb->vb.v4l2_buf.sequence = vou_dev->sequence++;
+        vb->vb.sequence = vou_dev->sequence++;
-        vb->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
+        vb->vb.field = V4L2_FIELD_INTERLACED;
-        vb2_buffer_done(&vb->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vb->vb.vb2_buf, VB2_BUF_STATE_DONE);
        vou_dev->active = list_entry(vou_dev->buf_list.next,
                                     struct sh_vou_buffer, list);
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 45e304a3dd85..1036f77ab28a 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -60,7 +60,7 @@ struct isi_dma_desc {
 /* Frame buffer data */
 struct frame_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct isi_dma_desc *p_dma_desc;
        struct list_head list;
 };
@@ -161,13 +161,13 @@ static bool is_supported(struct soc_camera_device *icd,
 static irqreturn_t atmel_isi_handle_streaming(struct atmel_isi *isi)
 {
        if (isi->active) {
-                struct vb2_buffer *vb = &isi->active->vb;
+                struct vb2_v4l2_buffer *vbuf = &isi->active->vb;
                struct frame_buffer *buf = isi->active;
                list_del_init(&buf->list);
-                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbuf->timestamp);
-                vb->v4l2_buf.sequence = isi->sequence++;
+                vbuf->sequence = isi->sequence++;
-                vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_DONE);
        }
        if (list_empty(&isi->video_buffer_list)) {
@@ -277,7 +277,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int buffer_init(struct vb2_buffer *vb)
 {
-        struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
        buf->p_dma_desc = NULL;
        INIT_LIST_HEAD(&buf->list);
@@ -287,8 +288,9 @@ static int buffer_init(struct vb2_buffer *vb)
 static int buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
-        struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb);
+        struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct atmel_isi *isi = ici->priv;
        unsigned long size;
@@ -302,7 +304,7 @@ static int buffer_prepare(struct vb2_buffer *vb)
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(vb, 0, size);
        if (!buf->p_dma_desc) {
                if (list_empty(&isi->dma_desc_head)) {
@@ -329,10 +331,11 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_cleanup(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct atmel_isi *isi = ici->priv;
-        struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb);
+        struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
        /* This descriptor is available now and we add to head list */
        if (buf->p_dma_desc)
@@ -370,10 +373,11 @@ static void start_dma(struct atmel_isi *isi, struct frame_buffer *buffer)
 static void buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct atmel_isi *isi = ici->priv;
-        struct frame_buffer *buf = container_of(vb, struct frame_buffer, vb);
+        struct frame_buffer *buf = container_of(vbuf, struct frame_buffer, vb);
        unsigned long flags = 0;
        spin_lock_irqsave(&isi->lock, flags);
@@ -435,7 +439,7 @@ static void stop_streaming(struct vb2_queue *vq)
        /* Release all active buffers */
        list_for_each_entry_safe(buf, node, &isi->video_buffer_list, list) {
                list_del_init(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irq(&isi->lock);
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 6e413359b595..9079196708b1 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -225,7 +225,7 @@ struct mx2_buf_internal {
 /* buffer for one video frame */
 struct mx2_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer               vb;
+        struct vb2_v4l2_buffer vb;
        struct mx2_buf_internal         internal;
 };
@@ -530,11 +530,12 @@ out:
 static void mx2_videobuf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici =
                to_soc_camera_host(icd->parent);
        struct mx2_camera_dev *pcdev = ici->priv;
-        struct mx2_buffer *buf = container_of(vb, struct mx2_buffer, vb);
+        struct mx2_buffer *buf = container_of(vbuf, struct mx2_buffer, vb);
        unsigned long flags;
        dev_dbg(icd->parent, "%s (vb=0x%p) 0x%p %lu\n", __func__,
@@ -664,7 +665,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
        buf = list_first_entry(&pcdev->capture, struct mx2_buffer,
                               internal.queue);
        buf->internal.bufnum = 0;
-        vb = &buf->vb;
+        vb = &buf->vb.vb2_buf;
        phys = vb2_dma_contig_plane_dma_addr(vb, 0);
        mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum);
@@ -673,7 +674,7 @@ static int mx2_start_streaming(struct vb2_queue *q, unsigned int count)
        buf = list_first_entry(&pcdev->capture, struct mx2_buffer,
                               internal.queue);
        buf->internal.bufnum = 1;
-        vb = &buf->vb;
+        vb = &buf->vb.vb2_buf;
        phys = vb2_dma_contig_plane_dma_addr(vb, 0);
        mx27_update_emma_buf(pcdev, phys, buf->internal.bufnum);
@@ -1307,6 +1308,7 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
        struct mx2_buf_internal *ibuf;
        struct mx2_buffer *buf;
        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        unsigned long phys;
        ibuf = list_first_entry(&pcdev->active_bufs, struct mx2_buf_internal,
@@ -1323,7 +1325,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
        } else {
                buf = mx2_ibuf_to_buf(ibuf);
-                vb = &buf->vb;
+                vb = &buf->vb.vb2_buf;
+                vbuf = to_vb2_v4l2_buffer(vb);
 #ifdef DEBUG
                phys = vb2_dma_contig_plane_dma_addr(vb, 0);
                if (prp->cfg.channel == 1) {
@@ -1347,8 +1350,8 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
                                vb2_get_plane_payload(vb, 0));
                list_del_init(&buf->internal.queue);
-                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbuf->timestamp);
-                vb->v4l2_buf.sequence = pcdev->frame_count;
+                vbuf->sequence = pcdev->frame_count;
                if (err)
                        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
                else
@@ -1380,7 +1383,7 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
        list_move_tail(pcdev->capture.next, &pcdev->active_bufs);
-        vb = &buf->vb;
+        vb = &buf->vb.vb2_buf;
        phys = vb2_dma_contig_plane_dma_addr(vb, 0);
        mx27_update_emma_buf(pcdev, phys, bufnum);
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index ace41f53caca..5ea4350ffdd6 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -63,7 +63,7 @@
 struct mx3_camera_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer                       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head                        queue;
        /* One descriptot per scatterlist (per frame) */
@@ -133,7 +133,7 @@ static void csi_reg_write(struct mx3_camera_dev *mx3, u32 value, off_t reg)
        __raw_writel(value, mx3->base + reg);
 }
-static struct mx3_camera_buffer *to_mx3_vb(struct vb2_buffer *vb)
+static struct mx3_camera_buffer *to_mx3_vb(struct vb2_v4l2_buffer *vb)
 {
        return container_of(vb, struct mx3_camera_buffer, vb);
 }
@@ -151,14 +151,14 @@ static void mx3_cam_dma_done(void *arg)
        spin_lock(&mx3_cam->lock);
        if (mx3_cam->active) {
-                struct vb2_buffer *vb = &mx3_cam->active->vb;
+                struct vb2_v4l2_buffer *vb = &mx3_cam->active->vb;
                struct mx3_camera_buffer *buf = to_mx3_vb(vb);
                list_del_init(&buf->queue);
-                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vb->timestamp);
-                vb->v4l2_buf.field = mx3_cam->field;
+                vb->field = mx3_cam->field;
-                vb->v4l2_buf.sequence = mx3_cam->sequence++;
+                vb->sequence = mx3_cam->sequence++;
-                vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&vb->vb2_buf, VB2_BUF_STATE_DONE);
        }
        if (list_empty(&mx3_cam->capture)) {
@@ -257,10 +257,11 @@ static enum pixel_fmt fourcc_to_ipu_pix(__u32 fourcc)
 static void mx3_videobuf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        struct mx3_camera_buffer *buf = to_mx3_vb(vb);
+        struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
        struct scatterlist *sg = &buf->sg;
        struct dma_async_tx_descriptor *txd;
        struct idmac_channel *ichan = mx3_cam->idmac_channel[0];
@@ -273,7 +274,7 @@ static void mx3_videobuf_queue(struct vb2_buffer *vb)
        if (vb2_plane_size(vb, 0) < new_size) {
                dev_err(icd->parent, "Buffer #%d too small (%lu < %zu)\n",
-                        vb->v4l2_buf.index, vb2_plane_size(vb, 0), new_size);
+                        vbuf->vb2_buf.index, vb2_plane_size(vb, 0), new_size);
                goto error;
        }
@@ -357,10 +358,11 @@ error:
 static void mx3_videobuf_release(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        struct mx3_camera_buffer *buf = to_mx3_vb(vb);
+        struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
        struct dma_async_tx_descriptor *txd = buf->txd;
        unsigned long flags;
@@ -390,10 +392,11 @@ static void mx3_videobuf_release(struct vb2_buffer *vb)
 static int mx3_videobuf_init(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct mx3_camera_dev *mx3_cam = ici->priv;
-        struct mx3_camera_buffer *buf = to_mx3_vb(vb);
+        struct mx3_camera_buffer *buf = to_mx3_vb(vbuf);
        if (!buf->txd) {
                /* This is for locking debugging only */
@@ -424,7 +427,7 @@ static void mx3_stop_streaming(struct vb2_queue *q)
        list_for_each_entry_safe(buf, tmp, &mx3_cam->capture, queue) {
                list_del_init(&buf->queue);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&mx3_cam->lock, flags);
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 368ab7cfcbb4..98e2593b94db 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -478,7 +478,7 @@ struct rcar_vin_priv {
        struct soc_camera_host          ici;
        struct list_head                capture;
 #define MAX_BUFFER_NUM                  3
-        struct vb2_buffer               *queue_buf[MAX_BUFFER_NUM];
+        struct vb2_v4l2_buffer          *queue_buf[MAX_BUFFER_NUM];
        struct vb2_alloc_ctx            *alloc_ctx;
        enum v4l2_field                 field;
        unsigned int                    pdata_flags;
@@ -492,7 +492,7 @@ struct rcar_vin_priv {
 #define is_continuous_transfer(priv)    (priv->vb_count > MAX_BUFFER_NUM)
 struct rcar_vin_buffer {
-        struct vb2_buffer               vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head                list;
 };
@@ -748,7 +748,7 @@ static int rcar_vin_hw_ready(struct rcar_vin_priv *priv)
 /* Moves a buffer from the queue to the HW slots */
 static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
 {
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        dma_addr_t phys_addr_top;
        int slot;
@@ -760,10 +760,11 @@ static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
        if (slot < 0)
                return 0;
-        vb = &list_entry(priv->capture.next, struct rcar_vin_buffer, list)->vb;
+        vbuf = &list_entry(priv->capture.next,
-        list_del_init(to_buf_list(vb));
+                        struct rcar_vin_buffer, list)->vb;
-        priv->queue_buf[slot] = vb;
+        list_del_init(to_buf_list(vbuf));
-        phys_addr_top = vb2_dma_contig_plane_dma_addr(vb, 0);
+        priv->queue_buf[slot] = vbuf;
+        phys_addr_top = vb2_dma_contig_plane_dma_addr(&vbuf->vb2_buf, 0);
        iowrite32(phys_addr_top, priv->base + VNMB_REG(slot));
        return 1;
@@ -771,6 +772,7 @@ static int rcar_vin_fill_hw_slot(struct rcar_vin_priv *priv)
 static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct soc_camera_device *icd = soc_camera_from_vb2q(vb->vb2_queue);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct rcar_vin_priv *priv = ici->priv;
@@ -780,7 +782,7 @@ static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
        if (vb2_plane_size(vb, 0) < size) {
                dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
-                        vb->v4l2_buf.index, vb2_plane_size(vb, 0), size);
+                        vb->index, vb2_plane_size(vb, 0), size);
                goto error;
        }
@@ -791,14 +793,14 @@ static void rcar_vin_videobuf_queue(struct vb2_buffer *vb)
        spin_lock_irq(&priv->lock);
-        list_add_tail(to_buf_list(vb), &priv->capture);
+        list_add_tail(to_buf_list(vbuf), &priv->capture);
        rcar_vin_fill_hw_slot(priv);
        /* If we weren't running, and have enough buffers, start capturing! */
        if (priv->state != RUNNING && rcar_vin_hw_ready(priv)) {
                if (rcar_vin_setup(priv)) {
                        /* Submit error */
-                        list_del_init(to_buf_list(vb));
+                        list_del_init(to_buf_list(vbuf));
                        spin_unlock_irq(&priv->lock);
                        goto error;
                }
@@ -854,7 +856,7 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
        for (i = 0; i < MAX_BUFFER_NUM; i++) {
                if (priv->queue_buf[i]) {
-                        vb2_buffer_done(priv->queue_buf[i],
+                        vb2_buffer_done(&priv->queue_buf[i]->vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                        priv->queue_buf[i] = NULL;
                }
@@ -862,7 +864,7 @@ static void rcar_vin_stop_streaming(struct vb2_queue *vq)
        list_for_each_safe(buf_head, tmp, &priv->capture) {
                vb2_buffer_done(&list_entry(buf_head,
-                                        struct rcar_vin_buffer, list)->vb,
+                                struct rcar_vin_buffer, list)->vb.vb2_buf,
                                VB2_BUF_STATE_ERROR);
                list_del_init(buf_head);
        }
@@ -907,10 +909,11 @@ static irqreturn_t rcar_vin_irq(int irq, void *data)
                else
                        slot = 0;
-                priv->queue_buf[slot]->v4l2_buf.field = priv->field;
+                priv->queue_buf[slot]->field = priv->field;
-                priv->queue_buf[slot]->v4l2_buf.sequence = priv->sequence++;
+                priv->queue_buf[slot]->sequence = priv->sequence++;
-                v4l2_get_timestamp(&priv->queue_buf[slot]->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&priv->queue_buf[slot]->timestamp);
-                vb2_buffer_done(priv->queue_buf[slot], VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&priv->queue_buf[slot]->vb2_buf,
+                                VB2_BUF_STATE_DONE);
                priv->queue_buf[slot] = NULL;
                if (priv->state != STOPPING)
@@ -964,7 +967,7 @@ static void rcar_vin_remove_device(struct soc_camera_device *icd)
 {
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct rcar_vin_priv *priv = ici->priv;
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        int i;
        /* disable capture, disable interrupts */
@@ -978,10 +981,10 @@ static void rcar_vin_remove_device(struct soc_camera_device *icd)
        /* make sure active buffer is cancelled */
        spin_lock_irq(&priv->lock);
        for (i = 0; i < MAX_BUFFER_NUM; i++) {
-                vb = priv->queue_buf[i];
+                vbuf = priv->queue_buf[i];
-                if (vb) {
+                if (vbuf) {
-                        list_del_init(to_buf_list(vb));
+                        list_del_init(to_buf_list(vbuf));
-                        vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&vbuf->vb2_buf, VB2_BUF_STATE_ERROR);
                }
        }
        spin_unlock_irq(&priv->lock);
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index efdeea4490e8..171994298fde 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -93,7 +93,7 @@
 /* per video frame buffer */
 struct sh_mobile_ceu_buffer {
-        struct vb2_buffer vb; /* v4l buffer must be first */
+        struct vb2_v4l2_buffer vb; /* v4l buffer must be first */
        struct list_head queue;
 };
@@ -112,7 +112,7 @@ struct sh_mobile_ceu_dev {
        spinlock_t lock;                /* Protects video buffer lists */
        struct list_head capture;
-        struct vb2_buffer *active;
+        struct vb2_v4l2_buffer *active;
        struct vb2_alloc_ctx *alloc_ctx;
        struct sh_mobile_ceu_info *pdata;
@@ -152,9 +152,9 @@ struct sh_mobile_ceu_cam {
        u32 code;
 };
-static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_buffer *vb)
+static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_v4l2_buffer *vbuf)
 {
-        return container_of(vb, struct sh_mobile_ceu_buffer, vb);
+        return container_of(vbuf, struct sh_mobile_ceu_buffer, vb);
 }
 static void ceu_write(struct sh_mobile_ceu_dev *priv,
@@ -334,7 +334,8 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
                bottom2 = CDBCR;
        }
-        phys_addr_top = vb2_dma_contig_plane_dma_addr(pcdev->active, 0);
+        phys_addr_top =
+                vb2_dma_contig_plane_dma_addr(&pcdev->active->vb2_buf, 0);
        switch (icd->current_fmt->host_fmt->fourcc) {
        case V4L2_PIX_FMT_NV12:
@@ -369,7 +370,8 @@ static int sh_mobile_ceu_capture(struct sh_mobile_ceu_dev *pcdev)
 static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
 {
-        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
        /* Added list head initialization on alloc */
        WARN(!list_empty(&buf->queue), "Buffer %p on queue!\n", vb);
@@ -379,17 +381,19 @@ static int sh_mobile_ceu_videobuf_prepare(struct vb2_buffer *vb)
 static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
 {
-        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct soc_camera_device *icd = container_of(vb->vb2_queue,
+                        struct soc_camera_device, vb2_vidq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
-        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
+        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
        unsigned long size;
        size = icd->sizeimage;
        if (vb2_plane_size(vb, 0) < size) {
                dev_err(icd->parent, "Buffer #%d too small (%lu < %lu)\n",
-                        vb->v4l2_buf.index, vb2_plane_size(vb, 0), size);
+                        vb->index, vb2_plane_size(vb, 0), size);
                goto error;
        }
@@ -416,7 +420,7 @@ static void sh_mobile_ceu_videobuf_queue(struct vb2_buffer *vb)
                 * we are not interested in the return value of
                 * sh_mobile_ceu_capture here.
                 */
-                pcdev->active = vb;
+                pcdev->active = vbuf;
                sh_mobile_ceu_capture(pcdev);
        }
        spin_unlock_irq(&pcdev->lock);
@@ -429,14 +433,16 @@ error:
 static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
 {
-        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct soc_camera_device *icd = container_of(vb->vb2_queue,
+                        struct soc_camera_device, vb2_vidq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vb);
+        struct sh_mobile_ceu_buffer *buf = to_ceu_vb(vbuf);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
        spin_lock_irq(&pcdev->lock);
-        if (pcdev->active == vb) {
+        if (pcdev->active == vbuf) {
                /* disable capture (release DMA buffer), reset */
                ceu_write(pcdev, CAPSR, 1 << 16);
                pcdev->active = NULL;
@@ -458,7 +464,9 @@ static void sh_mobile_ceu_videobuf_release(struct vb2_buffer *vb)
 static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
 {
-        struct soc_camera_device *icd = container_of(vb->vb2_queue, struct soc_camera_device, vb2_vidq);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct soc_camera_device *icd = container_of(vb->vb2_queue,
+                        struct soc_camera_device, vb2_vidq);
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
        struct sh_mobile_ceu_dev *pcdev = ici->priv;
@@ -467,7 +475,7 @@ static int sh_mobile_ceu_videobuf_init(struct vb2_buffer *vb)
                pcdev->buf_total);
        /* This is for locking debugging only */
-        INIT_LIST_HEAD(&to_ceu_vb(vb)->queue);
+        INIT_LIST_HEAD(&to_ceu_vb(vbuf)->queue);
        return 0;
 }
@@ -504,17 +512,17 @@ static struct vb2_ops sh_mobile_ceu_videobuf_ops = {
 static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
 {
        struct sh_mobile_ceu_dev *pcdev = data;
-        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        int ret;
        spin_lock(&pcdev->lock);
-        vb = pcdev->active;
+        vbuf = pcdev->active;
-        if (!vb)
+        if (!vbuf)
                /* Stale interrupt from a released buffer */
                goto out;
-        list_del_init(&to_ceu_vb(vb)->queue);
+        list_del_init(&to_ceu_vb(vbuf)->queue);
        if (!list_empty(&pcdev->capture))
                pcdev->active = &list_entry(pcdev->capture.next,
@@ -523,12 +531,13 @@ static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
                pcdev->active = NULL;
        ret = sh_mobile_ceu_capture(pcdev);
-        v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vbuf->timestamp);
        if (!ret) {
-                vb->v4l2_buf.field = pcdev->field;
+                vbuf->field = pcdev->field;
-                vb->v4l2_buf.sequence = pcdev->sequence++;
+                vbuf->sequence = pcdev->sequence++;
        }
-        vb2_buffer_done(vb, ret < 0 ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vbuf->vb2_buf,
+                        ret < 0 ? VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
 out:
        spin_unlock(&pcdev->lock);
@@ -633,7 +642,7 @@ static void sh_mobile_ceu_clock_stop(struct soc_camera_host *ici)
        spin_lock_irq(&pcdev->lock);
        if (pcdev->active) {
                list_del_init(&to_ceu_vb(pcdev->active)->queue);
-                vb2_buffer_done(pcdev->active, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&pcdev->active->vb2_buf, VB2_BUF_STATE_ERROR);
                pcdev->active = NULL;
        }
        spin_unlock_irq(&pcdev->lock);
diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
index df61355b46f1..62b9842aa633 100644
--- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
+++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
@@ -180,7 +180,7 @@ static struct bdisp_frame *ctx_get_frame(struct bdisp_ctx *ctx,
 static void bdisp_job_finish(struct bdisp_ctx *ctx, int vb_state)
 {
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        if (WARN(!ctx || !ctx->fh.m2m_ctx, "Null hardware context\n"))
                return;
@@ -191,10 +191,10 @@ static void bdisp_job_finish(struct bdisp_ctx *ctx, int vb_state)
        dst_vb = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
        if (src_vb && dst_vb) {
-                dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+                dst_vb->timestamp = src_vb->timestamp;
-                dst_vb->v4l2_buf.timecode = src_vb->v4l2_buf.timecode;
+                dst_vb->timecode = src_vb->timecode;
-                dst_vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                dst_vb->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
-                dst_vb->v4l2_buf.flags |= src_vb->v4l2_buf.flags &
+                dst_vb->flags |= src_vb->flags &
                                          V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
                v4l2_m2m_buf_done(src_vb, vb_state);
@@ -281,23 +281,23 @@ static int bdisp_get_addr(struct bdisp_ctx *ctx, struct vb2_buffer *vb,
 static int bdisp_get_bufs(struct bdisp_ctx *ctx)
 {
        struct bdisp_frame *src, *dst;
-        struct vb2_buffer *src_vb, *dst_vb;
+        struct vb2_v4l2_buffer *src_vb, *dst_vb;
        int ret;
        src = &ctx->src;
        dst = &ctx->dst;
        src_vb = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
-        ret = bdisp_get_addr(ctx, src_vb, src, src->paddr);
+        ret = bdisp_get_addr(ctx, &src_vb->vb2_buf, src, src->paddr);
        if (ret)
                return ret;
        dst_vb = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
-        ret = bdisp_get_addr(ctx, dst_vb, dst, dst->paddr);
+        ret = bdisp_get_addr(ctx, &dst_vb->vb2_buf, dst, dst->paddr);
        if (ret)
                return ret;
-        dst_vb->v4l2_buf.timestamp = src_vb->v4l2_buf.timestamp;
+        dst_vb->timestamp = src_vb->timestamp;
        return 0;
 }
@@ -483,6 +483,7 @@ static int bdisp_buf_prepare(struct vb2_buffer *vb)
 static void bdisp_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct bdisp_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        /* return to V4L2 any 0-size buffer so it can be dequeued by user */
@@ -493,13 +494,13 @@ static void bdisp_buf_queue(struct vb2_buffer *vb)
        }
        if (ctx->fh.m2m_ctx)
-                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
+                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
 }
 static int bdisp_start_streaming(struct vb2_queue *q, unsigned int count)
 {
        struct bdisp_ctx *ctx = q->drv_priv;
-        struct vb2_buffer *buf;
+        struct vb2_v4l2_buffer *buf;
        int ret = pm_runtime_get_sync(ctx->bdisp_dev->dev);
        if (ret < 0) {
diff --git a/drivers/media/platform/ti-vpe/vpe.c b/drivers/media/platform/ti-vpe/vpe.c
index d82c2f279dfb..4902453aeb61 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -384,8 +384,8 @@ struct vpe_ctx {
        unsigned int            bufs_completed;         /* bufs done in this batch */
        struct vpe_q_data       q_data[2];              /* src & dst queue data */
-        struct vb2_buffer       *src_vbs[VPE_MAX_SRC_BUFS];
+        struct vb2_v4l2_buffer  *src_vbs[VPE_MAX_SRC_BUFS];
-        struct vb2_buffer       *dst_vb;
+        struct vb2_v4l2_buffer  *dst_vb;
        dma_addr_t              mv_buf_dma[2];          /* dma addrs of motion vector in/out bufs */
        void                    *mv_buf[2];             /* virtual addrs of motion vector bufs */
@@ -988,7 +988,7 @@ static void add_out_dtd(struct vpe_ctx *ctx, int port)
 {
        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_DST];
        const struct vpe_port_data *p_data = &port_data[port];
-        struct vb2_buffer *vb = ctx->dst_vb;
+        struct vb2_buffer *vb = &ctx->dst_vb->vb2_buf;
        struct vpe_fmt *fmt = q_data->fmt;
        const struct vpdma_data_format *vpdma_fmt;
        int mv_buf_selector = !ctx->src_mv_buf_selector;
@@ -1025,11 +1025,12 @@ static void add_in_dtd(struct vpe_ctx *ctx, int port)
 {
        struct vpe_q_data *q_data = &ctx->q_data[Q_DATA_SRC];
        const struct vpe_port_data *p_data = &port_data[port];
-        struct vb2_buffer *vb = ctx->src_vbs[p_data->vb_index];
+        struct vb2_buffer *vb = &ctx->src_vbs[p_data->vb_index]->vb2_buf;
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_fmt *fmt = q_data->fmt;
        const struct vpdma_data_format *vpdma_fmt;
        int mv_buf_selector = ctx->src_mv_buf_selector;
-        int field = vb->v4l2_buf.field == V4L2_FIELD_BOTTOM;
+        int field = vbuf->field == V4L2_FIELD_BOTTOM;
        int frame_width, frame_height;
        dma_addr_t dma_addr;
        u32 flags = 0;
@@ -1222,8 +1223,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
        struct vpe_dev *dev = (struct vpe_dev *)data;
        struct vpe_ctx *ctx;
        struct vpe_q_data *d_q_data;
-        struct vb2_buffer *s_vb, *d_vb;
+        struct vb2_v4l2_buffer *s_vb, *d_vb;
-        struct v4l2_buffer *s_buf, *d_buf;
        unsigned long flags;
        u32 irqst0, irqst1;
@@ -1286,20 +1286,18 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
        s_vb = ctx->src_vbs[0];
        d_vb = ctx->dst_vb;
-        s_buf = &s_vb->v4l2_buf;
-        d_buf = &d_vb->v4l2_buf;
-        d_buf->flags = s_buf->flags;
+        d_vb->flags = s_vb->flags;
+        d_vb->timestamp = s_vb->timestamp;
-        d_buf->timestamp = s_buf->timestamp;
+        if (s_vb->flags & V4L2_BUF_FLAG_TIMECODE)
-        if (s_buf->flags & V4L2_BUF_FLAG_TIMECODE)
+                d_vb->timecode = s_vb->timecode;
-                d_buf->timecode = s_buf->timecode;
-        d_buf->sequence = ctx->sequence;
+        d_vb->sequence = ctx->sequence;
        d_q_data = &ctx->q_data[Q_DATA_DST];
        if (d_q_data->flags & Q_DATA_INTERLACED) {
-                d_buf->field = ctx->field;
+                d_vb->field = ctx->field;
                if (ctx->field == V4L2_FIELD_BOTTOM) {
                        ctx->sequence++;
                        ctx->field = V4L2_FIELD_TOP;
@@ -1308,7 +1306,7 @@ static irqreturn_t vpe_irq(int irq_vpe, void *data)
                        ctx->field = V4L2_FIELD_BOTTOM;
                }
        } else {
-                d_buf->field = V4L2_FIELD_NONE;
+                d_vb->field = V4L2_FIELD_NONE;
                ctx->sequence++;
        }
@@ -1825,6 +1823,7 @@ static int vpe_queue_setup(struct vb2_queue *vq,
 static int vpe_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
        struct vpe_q_data *q_data;
        int i, num_planes;
@@ -1836,10 +1835,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
        if (vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
                if (!(q_data->flags & Q_DATA_INTERLACED)) {
-                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                        vbuf->field = V4L2_FIELD_NONE;
                } else {
-                        if (vb->v4l2_buf.field != V4L2_FIELD_TOP &&
+                        if (vbuf->field != V4L2_FIELD_TOP &&
-                                        vb->v4l2_buf.field != V4L2_FIELD_BOTTOM)
+                                        vbuf->field != V4L2_FIELD_BOTTOM)
                                return -EINVAL;
                }
        }
@@ -1862,9 +1861,10 @@ static int vpe_buf_prepare(struct vb2_buffer *vb)
 static void vpe_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpe_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 vpe_start_streaming(struct vb2_queue *q, unsigned int count)
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_v4l2_buffer *in_vb,
-                          struct vb2_buffer *out_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_in = vb2_plane_vaddr(&in_vb->vb2_buf, 0);
-        p_out = vb2_plane_vaddr(out_vb, 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++;
+        out_vb->sequence =
-        in_vb->v4l2_buf.sequence = q_data->sequence++;
+                get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE)->sequence++;
-        out_vb->v4l2_buf.timestamp = in_vb->v4l2_buf.timestamp;
+        in_vb->sequence = q_data->sequence++;
-        if (in_vb->v4l2_buf.flags & V4L2_BUF_FLAG_TIMECODE)
+        out_vb->timestamp = in_vb->timestamp;
-                out_vb->v4l2_buf.timecode = in_vb->v4l2_buf.timecode;
-        out_vb->v4l2_buf.field = in_vb->v4l2_buf.field;
+        if (in_vb->flags & V4L2_BUF_FLAG_TIMECODE)
-        out_vb->v4l2_buf.flags = in_vb->v4l2_buf.flags &
+                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)
+                if (vbuf->field == V4L2_FIELD_ANY)
-                        vb->v4l2_buf.field = V4L2_FIELD_NONE;
+                        vbuf->field = V4L2_FIELD_NONE;
-                if (vb->v4l2_buf.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);
+                        vbuf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx);
-                if (vb == NULL)
+                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);
        }
 }
diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h
index 3816d3c69f5c..55b304a705d5 100644
--- a/drivers/media/platform/vivid/vivid-core.h
+++ b/drivers/media/platform/vivid/vivid-core.h
@@ -93,7 +93,7 @@ extern struct vivid_fmt vivid_formats[];
 /* buffer for one video frame */
 struct vivid_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head        list;
 };
diff --git a/drivers/media/platform/vivid/vivid-kthread-cap.c b/drivers/media/platform/vivid/vivid-kthread-cap.c
index 1727f5453f0b..83cc6d3b4784 100644
--- a/drivers/media/platform/vivid/vivid-kthread-cap.c
+++ b/drivers/media/platform/vivid/vivid-kthread-cap.c
@@ -236,8 +236,8 @@ static void *plane_vaddr(struct tpg_data *tpg, struct vivid_buffer *buf,
        void *vbuf;
        if (p == 0 || tpg_g_buffers(tpg) > 1)
-                return vb2_plane_vaddr(&buf->vb, p);
+                return vb2_plane_vaddr(&buf->vb.vb2_buf, p);
-        vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        for (i = 0; i < p; i++)
                vbuf += bpl[i] * h / tpg->vdownsampling[i];
        return vbuf;
@@ -246,7 +246,7 @@ static void *plane_vaddr(struct tpg_data *tpg, struct vivid_buffer *buf,
 static int vivid_copy_buffer(struct vivid_dev *dev, unsigned p, u8 *vcapbuf,
                struct vivid_buffer *vid_cap_buf)
 {
-        bool blank = dev->must_blank[vid_cap_buf->vb.v4l2_buf.index];
+        bool blank = dev->must_blank[vid_cap_buf->vb.vb2_buf.index];
        struct tpg_data *tpg = &dev->tpg;
        struct vivid_buffer *vid_out_buf = NULL;
        unsigned vdiv = dev->fmt_out->vdownsampling[p];
@@ -283,12 +283,12 @@ static int vivid_copy_buffer(struct vivid_dev *dev, unsigned p, u8 *vcapbuf,
        if (vid_out_buf == NULL)
                return -ENODATA;
-        vid_cap_buf->vb.v4l2_buf.field = vid_out_buf->vb.v4l2_buf.field;
+        vid_cap_buf->vb.field = vid_out_buf->vb.field;
        voutbuf = plane_vaddr(tpg, vid_out_buf, p,
                              dev->bytesperline_out, dev->fmt_out_rect.height);
        if (p < dev->fmt_out->buffers)
-                voutbuf += vid_out_buf->vb.v4l2_planes[p].data_offset;
+                voutbuf += vid_out_buf->vb.vb2_buf.planes[p].data_offset;
        voutbuf += tpg_hdiv(tpg, p, dev->loop_vid_out.left) +
                (dev->loop_vid_out.top / vdiv) * stride_out;
        vcapbuf += tpg_hdiv(tpg, p, dev->compose_cap.left) +
@@ -429,17 +429,19 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
        bool is_loop = false;
        if (dev->loop_video && dev->can_loop_video &&
-            ((vivid_is_svid_cap(dev) && !VIVID_INVALID_SIGNAL(dev->std_signal_mode)) ||
+                ((vivid_is_svid_cap(dev) &&
-             (vivid_is_hdmi_cap(dev) && !VIVID_INVALID_SIGNAL(dev->dv_timings_signal_mode))))
+                !VIVID_INVALID_SIGNAL(dev->std_signal_mode)) ||
+                (vivid_is_hdmi_cap(dev) &&
+                !VIVID_INVALID_SIGNAL(dev->dv_timings_signal_mode))))
                is_loop = true;
-        buf->vb.v4l2_buf.sequence = dev->vid_cap_seq_count;
+        buf->vb.sequence = dev->vid_cap_seq_count;
        /*
         * Take the timestamp now if the timestamp source is set to
         * "Start of Exposure".
         */
        if (dev->tstamp_src_is_soe)
-                v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&buf->vb.timestamp);
        if (dev->field_cap == V4L2_FIELD_ALTERNATE) {
                /*
                 * 60 Hz standards start with the bottom field, 50 Hz standards
@@ -447,19 +449,19 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
                 * then the field is TOP for 50 Hz and BOTTOM for 60 Hz
                 * standards.
                 */
-                buf->vb.v4l2_buf.field = ((dev->vid_cap_seq_count & 1) ^ is_60hz) ?
+                buf->vb.field = ((dev->vid_cap_seq_count & 1) ^ is_60hz) ?
                        V4L2_FIELD_BOTTOM : V4L2_FIELD_TOP;
                /*
                 * The sequence counter counts frames, not fields. So divide
                 * by two.
                 */
-                buf->vb.v4l2_buf.sequence /= 2;
+                buf->vb.sequence /= 2;
        } else {
-                buf->vb.v4l2_buf.field = dev->field_cap;
+                buf->vb.field = dev->field_cap;
        }
-        tpg_s_field(tpg, buf->vb.v4l2_buf.field,
+        tpg_s_field(tpg, buf->vb.field,
                    dev->field_cap == V4L2_FIELD_ALTERNATE);
-        tpg_s_perc_fill_blank(tpg, dev->must_blank[buf->vb.v4l2_buf.index]);
+        tpg_s_perc_fill_blank(tpg, dev->must_blank[buf->vb.vb2_buf.index]);
        vivid_precalc_copy_rects(dev);
@@ -479,13 +481,16 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
                }
                tpg_calc_text_basep(tpg, basep, p, vbuf);
                if (!is_loop || vivid_copy_buffer(dev, p, vbuf, buf))
-                        tpg_fill_plane_buffer(tpg, vivid_get_std_cap(dev), p, vbuf);
+                        tpg_fill_plane_buffer(tpg, vivid_get_std_cap(dev),
+                                        p, vbuf);
        }
-        dev->must_blank[buf->vb.v4l2_buf.index] = false;
+        dev->must_blank[buf->vb.vb2_buf.index] = false;
        /* Updates stream time, only update at the start of a new frame. */
-        if (dev->field_cap != V4L2_FIELD_ALTERNATE || (buf->vb.v4l2_buf.sequence & 1) == 0)
+        if (dev->field_cap != V4L2_FIELD_ALTERNATE ||
-                dev->ms_vid_cap = jiffies_to_msecs(jiffies - dev->jiffies_vid_cap);
+                        (buf->vb.sequence & 1) == 0)
+                dev->ms_vid_cap =
+                        jiffies_to_msecs(jiffies - dev->jiffies_vid_cap);
        ms = dev->ms_vid_cap;
        if (dev->osd_mode <= 1) {
@@ -494,9 +499,9 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
                                (ms / (60 * 1000)) % 60,
                                (ms / 1000) % 60,
                                ms % 1000,
-                                buf->vb.v4l2_buf.sequence,
+                                buf->vb.sequence,
                                (dev->field_cap == V4L2_FIELD_ALTERNATE) ?
-                                        (buf->vb.v4l2_buf.field == V4L2_FIELD_TOP ?
+                                        (buf->vb.field == V4L2_FIELD_TOP ?
                                         " top" : " bottom") : "");
                tpg_gen_text(tpg, basep, line++ * line_height, 16, str);
        }
@@ -553,8 +558,8 @@ static void vivid_fillbuff(struct vivid_dev *dev, struct vivid_buffer *buf)
         * the timestamp now.
         */
        if (!dev->tstamp_src_is_soe)
-                v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+        buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
 }
 /*
@@ -600,7 +605,7 @@ static void vivid_overlay(struct vivid_dev *dev, struct vivid_buffer *buf)
        struct tpg_data *tpg = &dev->tpg;
        unsigned pixsize = tpg_g_twopixelsize(tpg, 0) / 2;
        void *vbase = dev->fb_vbase_cap;
-        void *vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        void *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        unsigned img_width = dev->compose_cap.width;
        unsigned img_height = dev->compose_cap.height;
        unsigned stride = tpg->bytesperline[0];
@@ -616,7 +621,7 @@ static void vivid_overlay(struct vivid_dev *dev, struct vivid_buffer *buf)
                return;
        if ((dev->overlay_cap_field == V4L2_FIELD_TOP ||
             dev->overlay_cap_field == V4L2_FIELD_BOTTOM) &&
-            dev->overlay_cap_field != buf->vb.v4l2_buf.field)
+            dev->overlay_cap_field != buf->vb.field)
                return;
        vbuf += dev->compose_cap.left * pixsize + dev->compose_cap.top * stride;
@@ -699,17 +704,17 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs)
                /* Fill buffer */
                vivid_fillbuff(dev, vid_cap_buf);
                dprintk(dev, 1, "filled buffer %d\n",
-                        vid_cap_buf->vb.v4l2_buf.index);
+                        vid_cap_buf->vb.vb2_buf.index);
                /* Handle overlay */
                if (dev->overlay_cap_owner && dev->fb_cap.base &&
-                                dev->fb_cap.fmt.pixelformat == dev->fmt_cap->fourcc)
+                        dev->fb_cap.fmt.pixelformat == dev->fmt_cap->fourcc)
                        vivid_overlay(dev, vid_cap_buf);
-                vb2_buffer_done(&vid_cap_buf->vb, dev->dqbuf_error ?
+                vb2_buffer_done(&vid_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                dprintk(dev, 2, "vid_cap buffer %d done\n",
-                                vid_cap_buf->vb.v4l2_buf.index);
+                                vid_cap_buf->vb.vb2_buf.index);
        }
        if (vbi_cap_buf) {
@@ -717,10 +722,10 @@ static void vivid_thread_vid_cap_tick(struct vivid_dev *dev, int dropped_bufs)
                        vivid_sliced_vbi_cap_process(dev, vbi_cap_buf);
                else
                        vivid_raw_vbi_cap_process(dev, vbi_cap_buf);
-                vb2_buffer_done(&vbi_cap_buf->vb, dev->dqbuf_error ?
+                vb2_buffer_done(&vbi_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                dprintk(dev, 2, "vbi_cap %d done\n",
-                                vbi_cap_buf->vb.v4l2_buf.index);
+                                vbi_cap_buf->vb.vb2_buf.index);
        }
        dev->dqbuf_error = false;
@@ -884,9 +889,9 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)
                        buf = list_entry(dev->vid_cap_active.next,
                                         struct vivid_buffer, list);
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                        dprintk(dev, 2, "vid_cap buffer %d done\n",
-                                buf->vb.v4l2_buf.index);
+                                buf->vb.vb2_buf.index);
                }
        }
@@ -897,9 +902,9 @@ void vivid_stop_generating_vid_cap(struct vivid_dev *dev, bool *pstreaming)
                        buf = list_entry(dev->vbi_cap_active.next,
                                         struct vivid_buffer, list);
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                        dprintk(dev, 2, "vbi_cap buffer %d done\n",
-                                buf->vb.v4l2_buf.index);
+                                buf->vb.vb2_buf.index);
                }
        }
diff --git a/drivers/media/platform/vivid/vivid-kthread-out.c b/drivers/media/platform/vivid/vivid-kthread-out.c
index d9f36ccd7efb..c2c46dcdbe95 100644
--- a/drivers/media/platform/vivid/vivid-kthread-out.c
+++ b/drivers/media/platform/vivid/vivid-kthread-out.c
@@ -87,33 +87,33 @@ static void vivid_thread_vid_out_tick(struct vivid_dev *dev)
                return;
        if (vid_out_buf) {
-                vid_out_buf->vb.v4l2_buf.sequence = dev->vid_out_seq_count;
+                vid_out_buf->vb.sequence = dev->vid_out_seq_count;
                if (dev->field_out == V4L2_FIELD_ALTERNATE) {
                        /*
-                         * The sequence counter counts frames, not fields. So divide
+                         * The sequence counter counts frames, not fields.
-                         * by two.
+                         * So divide by two.
                         */
-                        vid_out_buf->vb.v4l2_buf.sequence /= 2;
+                        vid_out_buf->vb.sequence /= 2;
                }
-                v4l2_get_timestamp(&vid_out_buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vid_out_buf->vb.timestamp);
-                vid_out_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+                vid_out_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
-                vb2_buffer_done(&vid_out_buf->vb, dev->dqbuf_error ?
+                vb2_buffer_done(&vid_out_buf->vb.vb2_buf, dev->dqbuf_error ?
                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                dprintk(dev, 2, "vid_out buffer %d done\n",
-                        vid_out_buf->vb.v4l2_buf.index);
+                        vid_out_buf->vb.vb2_buf.index);
        }
        if (vbi_out_buf) {
                if (dev->stream_sliced_vbi_out)
                        vivid_sliced_vbi_out_process(dev, vbi_out_buf);
-                vbi_out_buf->vb.v4l2_buf.sequence = dev->vbi_out_seq_count;
+                vbi_out_buf->vb.sequence = dev->vbi_out_seq_count;
-                v4l2_get_timestamp(&vbi_out_buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vbi_out_buf->vb.timestamp);
-                vbi_out_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+                vbi_out_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
-                vb2_buffer_done(&vbi_out_buf->vb, dev->dqbuf_error ?
+                vb2_buffer_done(&vbi_out_buf->vb.vb2_buf, dev->dqbuf_error ?
                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                dprintk(dev, 2, "vbi_out buffer %d done\n",
-                        vbi_out_buf->vb.v4l2_buf.index);
+                        vbi_out_buf->vb.vb2_buf.index);
        }
        dev->dqbuf_error = false;
 }
@@ -274,9 +274,9 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming)
                        buf = list_entry(dev->vid_out_active.next,
                                         struct vivid_buffer, list);
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                        dprintk(dev, 2, "vid_out buffer %d done\n",
-                                buf->vb.v4l2_buf.index);
+                                buf->vb.vb2_buf.index);
                }
        }
@@ -287,9 +287,9 @@ void vivid_stop_generating_vid_out(struct vivid_dev *dev, bool *pstreaming)
                        buf = list_entry(dev->vbi_out_active.next,
                                         struct vivid_buffer, list);
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                        dprintk(dev, 2, "vbi_out buffer %d done\n",
-                                buf->vb.v4l2_buf.index);
+                                buf->vb.vb2_buf.index);
                }
        }
diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/platform/vivid/vivid-sdr-cap.c
index d0c26577c06e..536a6259b847 100644
--- a/drivers/media/platform/vivid/vivid-sdr-cap.c
+++ b/drivers/media/platform/vivid/vivid-sdr-cap.c
@@ -115,11 +115,11 @@ static void vivid_thread_sdr_cap_tick(struct vivid_dev *dev)
        spin_unlock(&dev->slock);
        if (sdr_cap_buf) {
-                sdr_cap_buf->vb.v4l2_buf.sequence = dev->sdr_cap_seq_count;
+                sdr_cap_buf->vb.sequence = dev->sdr_cap_seq_count;
                vivid_sdr_cap_process(dev, sdr_cap_buf);
-                v4l2_get_timestamp(&sdr_cap_buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&sdr_cap_buf->vb.timestamp);
-                sdr_cap_buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+                sdr_cap_buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
-                vb2_buffer_done(&sdr_cap_buf->vb, dev->dqbuf_error ?
+                vb2_buffer_done(&sdr_cap_buf->vb.vb2_buf, dev->dqbuf_error ?
                                VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
                dev->dqbuf_error = false;
        }
@@ -162,7 +162,8 @@ static int vivid_thread_sdr_cap(void *data)
                /* Calculate the number of jiffies since we started streaming */
                jiffies_since_start = cur_jiffies - dev->jiffies_sdr_cap;
                /* Get the number of buffers streamed since the start */
-                buffers_since_start = (u64)jiffies_since_start * dev->sdr_adc_freq +
+                buffers_since_start =
+                        (u64)jiffies_since_start * dev->sdr_adc_freq +
                                      (HZ * SDR_CAP_SAMPLES_PER_BUF) / 2;
                do_div(buffers_since_start, HZ * SDR_CAP_SAMPLES_PER_BUF);
@@ -177,7 +178,8 @@ static int vivid_thread_sdr_cap(void *data)
                        dev->sdr_cap_seq_offset = buffers_since_start;
                        buffers_since_start = 0;
                }
-                dev->sdr_cap_seq_count = buffers_since_start + dev->sdr_cap_seq_offset;
+                dev->sdr_cap_seq_count =
+                        buffers_since_start + dev->sdr_cap_seq_offset;
                vivid_thread_sdr_cap_tick(dev);
                mutex_unlock(&dev->mutex);
@@ -248,8 +250,9 @@ static int sdr_cap_buf_prepare(struct vb2_buffer *vb)
 static void sdr_cap_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb);
+        struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
        dprintk(dev, 1, "%s\n", __func__);
@@ -283,7 +286,8 @@ static int sdr_cap_start_streaming(struct vb2_queue *vq, unsigned count)
                list_for_each_entry_safe(buf, tmp, &dev->sdr_cap_active, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
        return err;
@@ -300,9 +304,10 @@ static void sdr_cap_stop_streaming(struct vb2_queue *vq)
        while (!list_empty(&dev->sdr_cap_active)) {
                struct vivid_buffer *buf;
-                buf = list_entry(dev->sdr_cap_active.next, struct vivid_buffer, list);
+                buf = list_entry(dev->sdr_cap_active.next,
+                                struct vivid_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        /* shutdown control thread */
@@ -322,7 +327,8 @@ const struct vb2_ops vivid_sdr_cap_qops = {
        .wait_finish            = vb2_ops_wait_finish,
 };
-int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band)
+int vivid_sdr_enum_freq_bands(struct file *file, void *fh,
+                struct v4l2_frequency_band *band)
 {
        switch (band->tuner) {
        case 0:
@@ -340,7 +346,8 @@ int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency
        }
 }
-int vivid_sdr_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf)
+int vivid_sdr_g_frequency(struct file *file, void *fh,
+                struct v4l2_frequency *vf)
 {
        struct vivid_dev *dev = video_drvdata(file);
@@ -358,7 +365,8 @@ int vivid_sdr_g_frequency(struct file *file, void *fh, struct v4l2_frequency *vf
        }
 }
-int vivid_sdr_s_frequency(struct file *file, void *fh, const struct v4l2_frequency *vf)
+int vivid_sdr_s_frequency(struct file *file, void *fh,
+                const struct v4l2_frequency *vf)
 {
        struct vivid_dev *dev = video_drvdata(file);
        unsigned freq = vf->frequency;
@@ -404,14 +412,16 @@ int vivid_sdr_g_tuner(struct file *file, void *fh, struct v4l2_tuner *vt)
        case 0:
                strlcpy(vt->name, "ADC", sizeof(vt->name));
                vt->type = V4L2_TUNER_ADC;
-                vt->capability = V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
+                vt->capability =
+                        V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
                vt->rangelow = bands_adc[0].rangelow;
                vt->rangehigh = bands_adc[2].rangehigh;
                return 0;
        case 1:
                strlcpy(vt->name, "RF", sizeof(vt->name));
                vt->type = V4L2_TUNER_RF;
-                vt->capability = V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
+                vt->capability =
+                        V4L2_TUNER_CAP_1HZ | V4L2_TUNER_CAP_FREQ_BANDS;
                vt->rangelow = bands_fm[0].rangelow;
                vt->rangehigh = bands_fm[0].rangehigh;
                return 0;
@@ -493,9 +503,9 @@ int vidioc_try_fmt_sdr_cap(struct file *file, void *fh, struct v4l2_format *f)
 void vivid_sdr_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf)
 {
-        u8 *vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        u8 *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        unsigned long i;
-        unsigned long plane_size = vb2_plane_size(&buf->vb, 0);
+        unsigned long plane_size = vb2_plane_size(&buf->vb.vb2_buf, 0);
        s64 s64tmp;
        s32 src_phase_step;
        s32 mod_phase_step;
diff --git a/drivers/media/platform/vivid/vivid-vbi-cap.c b/drivers/media/platform/vivid/vivid-vbi-cap.c
index ef81b01b53d2..29931497fa0f 100644
--- a/drivers/media/platform/vivid/vivid-vbi-cap.c
+++ b/drivers/media/platform/vivid/vivid-vbi-cap.c
@@ -94,36 +94,38 @@ static void vivid_g_fmt_vbi_cap(struct vivid_dev *dev, struct v4l2_vbi_format *v
 void vivid_raw_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf)
 {
        struct v4l2_vbi_format vbi;
-        u8 *vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        u8 *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        vivid_g_fmt_vbi_cap(dev, &vbi);
-        buf->vb.v4l2_buf.sequence = dev->vbi_cap_seq_count;
+        buf->vb.sequence = dev->vbi_cap_seq_count;
        if (dev->field_cap == V4L2_FIELD_ALTERNATE)
-                buf->vb.v4l2_buf.sequence /= 2;
+                buf->vb.sequence /= 2;
-        vivid_sliced_vbi_cap_fill(dev, buf->vb.v4l2_buf.sequence);
+        vivid_sliced_vbi_cap_fill(dev, buf->vb.sequence);
-        memset(vbuf, 0x10, vb2_plane_size(&buf->vb, 0));
+        memset(vbuf, 0x10, vb2_plane_size(&buf->vb.vb2_buf, 0));
        if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode))
                vivid_vbi_gen_raw(&dev->vbi_gen, &vbi, vbuf);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+        buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
 }
-void vivid_sliced_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *buf)
+void vivid_sliced_vbi_cap_process(struct vivid_dev *dev,
+                        struct vivid_buffer *buf)
 {
-        struct v4l2_sliced_vbi_data *vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        struct v4l2_sliced_vbi_data *vbuf =
+                        vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
-        buf->vb.v4l2_buf.sequence = dev->vbi_cap_seq_count;
+        buf->vb.sequence = dev->vbi_cap_seq_count;
        if (dev->field_cap == V4L2_FIELD_ALTERNATE)
-                buf->vb.v4l2_buf.sequence /= 2;
+                buf->vb.sequence /= 2;
-        vivid_sliced_vbi_cap_fill(dev, buf->vb.v4l2_buf.sequence);
+        vivid_sliced_vbi_cap_fill(dev, buf->vb.sequence);
-        memset(vbuf, 0, vb2_plane_size(&buf->vb, 0));
+        memset(vbuf, 0, vb2_plane_size(&buf->vb.vb2_buf, 0));
        if (!VIVID_INVALID_SIGNAL(dev->std_signal_mode)) {
                unsigned i;
@@ -131,13 +133,14 @@ void vivid_sliced_vbi_cap_process(struct vivid_dev *dev, struct vivid_buffer *bu
                        vbuf[i] = dev->vbi_gen.data[i];
        }
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.timestamp.tv_sec += dev->time_wrap_offset;
+        buf->vb.timestamp.tv_sec += dev->time_wrap_offset;
 }
-static int vbi_cap_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
+static int vbi_cap_queue_setup(struct vb2_queue *vq,
-                       unsigned *nbuffers, unsigned *nplanes,
+                        const struct v4l2_format *fmt,
-                       unsigned sizes[], void *alloc_ctxs[])
+                        unsigned *nbuffers, unsigned *nplanes,
+                        unsigned sizes[], void *alloc_ctxs[])
 {
        struct vivid_dev *dev = vb2_get_drv_priv(vq);
        bool is_60hz = dev->std_cap & V4L2_STD_525_60;
@@ -187,8 +190,9 @@ static int vbi_cap_buf_prepare(struct vb2_buffer *vb)
 static void vbi_cap_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb);
+        struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
        dprintk(dev, 1, "%s\n", __func__);
@@ -215,7 +219,8 @@ static int vbi_cap_start_streaming(struct vb2_queue *vq, unsigned count)
                list_for_each_entry_safe(buf, tmp, &dev->vbi_cap_active, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
        return err;
diff --git a/drivers/media/platform/vivid/vivid-vbi-out.c b/drivers/media/platform/vivid/vivid-vbi-out.c
index 4e4c70e1e04a..91c168841477 100644
--- a/drivers/media/platform/vivid/vivid-vbi-out.c
+++ b/drivers/media/platform/vivid/vivid-vbi-out.c
@@ -79,8 +79,9 @@ static int vbi_out_buf_prepare(struct vb2_buffer *vb)
 static void vbi_out_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb);
+        struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
        dprintk(dev, 1, "%s\n", __func__);
@@ -107,7 +108,8 @@ static int vbi_out_start_streaming(struct vb2_queue *vq, unsigned count)
                list_for_each_entry_safe(buf, tmp, &dev->vbi_out_active, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
        return err;
@@ -201,7 +203,8 @@ int vidioc_try_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_forma
        return 0;
 }
-int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format *fmt)
+int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh,
+                struct v4l2_format *fmt)
 {
        struct vivid_dev *dev = video_drvdata(file);
        struct v4l2_sliced_vbi_format *vbi = &fmt->fmt.sliced;
@@ -217,10 +220,13 @@ int vidioc_s_fmt_sliced_vbi_out(struct file *file, void *fh, struct v4l2_format
        return 0;
 }
-void vivid_sliced_vbi_out_process(struct vivid_dev *dev, struct vivid_buffer *buf)
+void vivid_sliced_vbi_out_process(struct vivid_dev *dev,
+                struct vivid_buffer *buf)
 {
-        struct v4l2_sliced_vbi_data *vbi = vb2_plane_vaddr(&buf->vb, 0);
+        struct v4l2_sliced_vbi_data *vbi =
-        unsigned elems = vb2_get_plane_payload(&buf->vb, 0) / sizeof(*vbi);
+                vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
+        unsigned elems =
+                vb2_get_plane_payload(&buf->vb.vb2_buf, 0) / sizeof(*vbi);
        dev->vbi_out_have_cc[0] = false;
        dev->vbi_out_have_cc[1] = false;
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index ed0b8788a66f..2497107e3b98 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -198,7 +198,7 @@ static int vid_cap_buf_prepare(struct vb2_buffer *vb)
                }
                vb2_set_plane_payload(vb, p, size);
-                vb->v4l2_planes[p].data_offset = dev->fmt_cap->data_offset[p];
+                vb->planes[p].data_offset = dev->fmt_cap->data_offset[p];
        }
        return 0;
@@ -206,10 +206,11 @@ static int vid_cap_buf_prepare(struct vb2_buffer *vb)
 static void vid_cap_buf_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct v4l2_timecode *tc = &vb->v4l2_buf.timecode;
+        struct v4l2_timecode *tc = &vbuf->timecode;
        unsigned fps = 25;
-        unsigned seq = vb->v4l2_buf.sequence;
+        unsigned seq = vbuf->sequence;
        if (!vivid_is_sdtv_cap(dev))
                return;
@@ -218,7 +219,7 @@ static void vid_cap_buf_finish(struct vb2_buffer *vb)
         * Set the timecode. Rarely used, so it is interesting to
         * test this.
         */
-        vb->v4l2_buf.flags |= V4L2_BUF_FLAG_TIMECODE;
+        vbuf->flags |= V4L2_BUF_FLAG_TIMECODE;
        if (dev->std_cap & V4L2_STD_525_60)
                fps = 30;
        tc->type = (fps == 30) ? V4L2_TC_TYPE_30FPS : V4L2_TC_TYPE_25FPS;
@@ -231,8 +232,9 @@ static void vid_cap_buf_finish(struct vb2_buffer *vb)
 static void vid_cap_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb);
+        struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
        dprintk(dev, 1, "%s\n", __func__);
@@ -268,7 +270,8 @@ static int vid_cap_start_streaming(struct vb2_queue *vq, unsigned count)
                list_for_each_entry_safe(buf, tmp, &dev->vid_cap_active, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
        return err;
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index c404e275eae0..376f865f90b9 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -109,6 +109,7 @@ static int vid_out_queue_setup(struct vb2_queue *vq, const struct v4l2_format *f
 static int vid_out_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
        unsigned long size;
        unsigned planes;
@@ -131,14 +132,14 @@ static int vid_out_buf_prepare(struct vb2_buffer *vb)
        }
        if (dev->field_out != V4L2_FIELD_ALTERNATE)
-                vb->v4l2_buf.field = dev->field_out;
+                vbuf->field = dev->field_out;
-        else if (vb->v4l2_buf.field != V4L2_FIELD_TOP &&
+        else if (vbuf->field != V4L2_FIELD_TOP &&
-                 vb->v4l2_buf.field != V4L2_FIELD_BOTTOM)
+                 vbuf->field != V4L2_FIELD_BOTTOM)
                return -EINVAL;
        for (p = 0; p < planes; p++) {
                size = dev->bytesperline_out[p] * dev->fmt_out_rect.height +
-                        vb->v4l2_planes[p].data_offset;
+                        vb->planes[p].data_offset;
                if (vb2_get_plane_payload(vb, p) < size) {
                        dprintk(dev, 1, "%s the payload is too small for plane %u (%lu < %lu)\n",
@@ -152,8 +153,9 @@ static int vid_out_buf_prepare(struct vb2_buffer *vb)
 static void vid_out_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vivid_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct vivid_buffer *buf = container_of(vb, struct vivid_buffer, vb);
+        struct vivid_buffer *buf = container_of(vbuf, struct vivid_buffer, vb);
        dprintk(dev, 1, "%s\n", __func__);
@@ -186,7 +188,8 @@ static int vid_out_start_streaming(struct vb2_queue *vq, unsigned count)
                list_for_each_entry_safe(buf, tmp, &dev->vid_out_active, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
        return err;
diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
index 3294529a3108..cd5248a9a271 100644
--- a/drivers/media/platform/vsp1/vsp1_rpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rpf.c
@@ -200,10 +200,10 @@ static void rpf_vdev_queue(struct vsp1_video *video,
        vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_Y,
                       buf->addr[0] + rpf->offsets[0]);
-        if (buf->buf.num_planes > 1)
+        if (buf->buf.vb2_buf.num_planes > 1)
                vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C0,
                               buf->addr[1] + rpf->offsets[1]);
-        if (buf->buf.num_planes > 2)
+        if (buf->buf.vb2_buf.num_planes > 2)
                vsp1_rpf_write(rpf, VI6_RPF_SRCM_ADDR_C1,
                               buf->addr[2] + rpf->offsets[1]);
 }
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index dfd45c74c2ae..13e4fdcd4db0 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -610,11 +610,11 @@ vsp1_video_complete_buffer(struct vsp1_video *video)
        spin_unlock_irqrestore(&video->irqlock, flags);
-        done->buf.v4l2_buf.sequence = video->sequence++;
+        done->buf.sequence = video->sequence++;
-        v4l2_get_timestamp(&done->buf.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&done->buf.timestamp);
-        for (i = 0; i < done->buf.num_planes; ++i)
+        for (i = 0; i < done->buf.vb2_buf.num_planes; ++i)
-                vb2_set_plane_payload(&done->buf, i, done->length[i]);
+                vb2_set_plane_payload(&done->buf.vb2_buf, i, done->length[i]);
-        vb2_buffer_done(&done->buf, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&done->buf.vb2_buf, VB2_BUF_STATE_DONE);
        return next;
 }
@@ -820,8 +820,9 @@ vsp1_video_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int vsp1_video_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
-        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vb);
+        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
        const struct v4l2_pix_format_mplane *format = &video->format;
        unsigned int i;
@@ -841,9 +842,10 @@ static int vsp1_video_buffer_prepare(struct vb2_buffer *vb)
 static void vsp1_video_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vsp1_video *video = vb2_get_drv_priv(vb->vb2_queue);
        struct vsp1_pipeline *pipe = to_vsp1_pipeline(&video->video.entity);
-        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vb);
+        struct vsp1_video_buffer *buf = to_vsp1_video_buffer(vbuf);
        unsigned long flags;
        bool empty;
@@ -954,7 +956,7 @@ static void vsp1_video_stop_streaming(struct vb2_queue *vq)
        /* Remove all buffers from the IRQ queue. */
        spin_lock_irqsave(&video->irqlock, flags);
        list_for_each_entry(buffer, &video->irqqueue, queue)
-                vb2_buffer_done(&buffer->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buffer->buf.vb2_buf, VB2_BUF_STATE_ERROR);
        INIT_LIST_HEAD(&video->irqqueue);
        spin_unlock_irqrestore(&video->irqlock, flags);
 }
diff --git a/drivers/media/platform/vsp1/vsp1_video.h b/drivers/media/platform/vsp1/vsp1_video.h
index d808301a071f..a929aa81cdbf 100644
--- a/drivers/media/platform/vsp1/vsp1_video.h
+++ b/drivers/media/platform/vsp1/vsp1_video.h
@@ -94,7 +94,7 @@ static inline struct vsp1_pipeline *to_vsp1_pipeline(struct media_entity *e)
 }
 struct vsp1_video_buffer {
-        struct vb2_buffer buf;
+        struct vb2_v4l2_buffer buf;
        struct list_head queue;
        dma_addr_t addr[3];
@@ -102,9 +102,9 @@ struct vsp1_video_buffer {
 };
 static inline struct vsp1_video_buffer *
-to_vsp1_video_buffer(struct vb2_buffer *vb)
+to_vsp1_video_buffer(struct vb2_v4l2_buffer *vbuf)
 {
-        return container_of(vb, struct vsp1_video_buffer, buf);
+        return container_of(vbuf, struct vsp1_video_buffer, buf);
 }
 struct vsp1_video_operations {
diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
index 1d2b3a2f1573..95b62f4f77e7 100644
--- a/drivers/media/platform/vsp1/vsp1_wpf.c
+++ b/drivers/media/platform/vsp1/vsp1_wpf.c
@@ -201,9 +201,9 @@ static void wpf_vdev_queue(struct vsp1_video *video,
        struct vsp1_rwpf *wpf = container_of(video, struct vsp1_rwpf, video);
        vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_Y, buf->addr[0]);
-        if (buf->buf.num_planes > 1)
+        if (buf->buf.vb2_buf.num_planes > 1)
                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C0, buf->addr[1]);
-        if (buf->buf.num_planes > 2)
+        if (buf->buf.vb2_buf.num_planes > 2)
                vsp1_wpf_write(wpf, VI6_WPF_DSTM_ADDR_C1, buf->addr[2]);
 }
diff --git a/drivers/media/platform/xilinx/xilinx-dma.c b/drivers/media/platform/xilinx/xilinx-dma.c
index d9dcd4be2792..5af66c20475b 100644
--- a/drivers/media/platform/xilinx/xilinx-dma.c
+++ b/drivers/media/platform/xilinx/xilinx-dma.c
@@ -285,7 +285,7 @@ done:
 * @dma: DMA channel that uses the buffer
 */
 struct xvip_dma_buffer {
-        struct vb2_buffer buf;
+        struct vb2_v4l2_buffer buf;
        struct list_head queue;
        struct xvip_dma *dma;
 };
@@ -301,11 +301,11 @@ static void xvip_dma_complete(void *param)
        list_del(&buf->queue);
        spin_unlock(&dma->queued_lock);
-        buf->buf.v4l2_buf.field = V4L2_FIELD_NONE;
+        buf->buf.field = V4L2_FIELD_NONE;
-        buf->buf.v4l2_buf.sequence = dma->sequence++;
+        buf->buf.sequence = dma->sequence++;
-        v4l2_get_timestamp(&buf->buf.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->buf.timestamp);
-        vb2_set_plane_payload(&buf->buf, 0, dma->format.sizeimage);
+        vb2_set_plane_payload(&buf->buf.vb2_buf, 0, dma->format.sizeimage);
-        vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
 }
 static int
@@ -329,8 +329,9 @@ xvip_dma_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int xvip_dma_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
-        struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vb);
+        struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vbuf);
        buf->dma = dma;
@@ -339,8 +340,9 @@ static int xvip_dma_buffer_prepare(struct vb2_buffer *vb)
 static void xvip_dma_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct xvip_dma *dma = vb2_get_drv_priv(vb->vb2_queue);
-        struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vb);
+        struct xvip_dma_buffer *buf = to_xvip_dma_buffer(vbuf);
        struct dma_async_tx_descriptor *desc;
        dma_addr_t addr = vb2_dma_contig_plane_dma_addr(vb, 0);
        u32 flags;
@@ -367,7 +369,7 @@ static void xvip_dma_buffer_queue(struct vb2_buffer *vb)
        desc = dmaengine_prep_interleaved_dma(dma->dma, &dma->xt, flags);
        if (!desc) {
                dev_err(dma->xdev->dev, "Failed to prepare DMA transfer\n");
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
                return;
        }
        desc->callback = xvip_dma_complete;
@@ -434,7 +436,7 @@ error:
        /* Give back all queued buffers to videobuf2. */
        spin_lock_irq(&dma->queued_lock);
        list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) {
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_QUEUED);
                list_del(&buf->queue);
        }
        spin_unlock_irq(&dma->queued_lock);
@@ -461,7 +463,7 @@ static void xvip_dma_stop_streaming(struct vb2_queue *vq)
        /* Give back all queued buffers to videobuf2. */
        spin_lock_irq(&dma->queued_lock);
        list_for_each_entry_safe(buf, nbuf, &dma->queued_bufs, queue) {
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&buf->queue);
        }
        spin_unlock_irq(&dma->queued_lock);
diff --git a/drivers/media/usb/airspy/airspy.c b/drivers/media/usb/airspy/airspy.c
index 8f2e1c277c5f..2542af3b94be 100644
--- a/drivers/media/usb/airspy/airspy.c
+++ b/drivers/media/usb/airspy/airspy.c
@@ -21,6 +21,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 /* AirSpy USB API commands (from AirSpy Library) */
@@ -97,7 +98,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
 /* intermediate buffers with raw data from the USB device */
 struct airspy_frame_buf {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -310,13 +312,13 @@ static void airspy_urb_complete(struct urb *urb)
                }
                /* fill framebuffer */
-                ptr = vb2_plane_vaddr(&fbuf->vb, 0);
+                ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
                len = airspy_convert_stream(s, ptr, urb->transfer_buffer,
                                urb->actual_length);
-                vb2_set_plane_payload(&fbuf->vb, 0, len);
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
-                v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&fbuf->vb.timestamp);
-                fbuf->vb.v4l2_buf.sequence = s->sequence++;
+                fbuf->vb.sequence = s->sequence++;
-                vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
 skip:
        usb_submit_urb(urb, GFP_ATOMIC);
@@ -459,7 +461,7 @@ static void airspy_cleanup_queued_bufs(struct airspy *s)
                buf = list_entry(s->queued_bufs.next,
                                struct airspy_frame_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&s->queued_bufs_lock, flags);
 }
@@ -505,14 +507,15 @@ static int airspy_queue_setup(struct vb2_queue *vq,
 static void airspy_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct airspy *s = vb2_get_drv_priv(vb->vb2_queue);
        struct airspy_frame_buf *buf =
-                        container_of(vb, struct airspy_frame_buf, vb);
+                        container_of(vbuf, struct airspy_frame_buf, vb);
        unsigned long flags;
        /* Check the device has not disconnected between prep and queuing */
        if (unlikely(!s->udev)) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                return;
        }
@@ -571,7 +574,8 @@ err_clear_bit:
                list_for_each_entry_safe(buf, tmp, &s->queued_bufs, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
diff --git a/drivers/media/usb/au0828/au0828-vbi.c b/drivers/media/usb/au0828/au0828-vbi.c
index f67247cf1a5a..5ec507e9e66a 100644
--- a/drivers/media/usb/au0828/au0828-vbi.c
+++ b/drivers/media/usb/au0828/au0828-vbi.c
@@ -52,7 +52,6 @@ static int vbi_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int vbi_buffer_prepare(struct vb2_buffer *vb)
 {
        struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
        unsigned long size;
        size = dev->vbi_width * dev->vbi_height * 2;
@@ -62,7 +61,7 @@ static int vbi_buffer_prepare(struct vb2_buffer *vb)
                        __func__, vb2_plane_size(vb, 0), size);
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(vb, 0, size);
        return 0;
 }
@@ -71,7 +70,9 @@ static void
 vbi_buffer_queue(struct vb2_buffer *vb)
 {
        struct au0828_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct au0828_buffer *buf =
+                        container_of(vbuf, struct au0828_buffer, vb);
        struct au0828_dmaqueue *vbiq = &dev->vbiq;
        unsigned long flags = 0;
diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 1a362a041ab3..065b9c8d2a8e 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -302,20 +302,20 @@ static inline void buffer_filled(struct au0828_dev *dev,
                                 struct au0828_dmaqueue *dma_q,
                                 struct au0828_buffer *buf)
 {
-        struct vb2_buffer *vb = &buf->vb;
+        struct vb2_v4l2_buffer *vb = &buf->vb;
-        struct vb2_queue *q = vb->vb2_queue;
+        struct vb2_queue *q = vb->vb2_buf.vb2_queue;
        /* Advice that buffer was filled */
        au0828_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field);
        if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                vb->v4l2_buf.sequence = dev->frame_count++;
+                vb->sequence = dev->frame_count++;
        else
-                vb->v4l2_buf.sequence = dev->vbi_frame_count++;
+                vb->sequence = dev->vbi_frame_count++;
-        vb->v4l2_buf.field = V4L2_FIELD_INTERLACED;
+        vb->field = V4L2_FIELD_INTERLACED;
-        v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vb->timestamp);
-        vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vb->vb2_buf, VB2_BUF_STATE_DONE);
 }
 /*
@@ -531,11 +531,11 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
        buf = dev->isoc_ctl.buf;
        if (buf != NULL)
-                outp = vb2_plane_vaddr(&buf->vb, 0);
+                outp = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        vbi_buf = dev->isoc_ctl.vbi_buf;
        if (vbi_buf != NULL)
-                vbioutp = vb2_plane_vaddr(&vbi_buf->vb, 0);
+                vbioutp = vb2_plane_vaddr(&vbi_buf->vb.vb2_buf, 0);
        for (i = 0; i < urb->number_of_packets; i++) {
                int status = urb->iso_frame_desc[i].status;
@@ -574,7 +574,7 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
                                        vbioutp = NULL;
                                else
                                        vbioutp = vb2_plane_vaddr(
-                                                &vbi_buf->vb, 0);
+                                                &vbi_buf->vb.vb2_buf, 0);
                                /* Video */
                                if (buf != NULL)
@@ -583,7 +583,8 @@ static inline int au0828_isoc_copy(struct au0828_dev *dev, struct urb *urb)
                                if (buf == NULL)
                                        outp = NULL;
                                else
-                                        outp = vb2_plane_vaddr(&buf->vb, 0);
+                                        outp = vb2_plane_vaddr(
+                                                &buf->vb.vb2_buf, 0);
                                /* As long as isoc traffic is arriving, keep
                                   resetting the timer */
@@ -658,7 +659,9 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int
 buffer_prepare(struct vb2_buffer *vb)
 {
-        struct au0828_buffer *buf = container_of(vb, struct au0828_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct au0828_buffer *buf = container_of(vbuf,
+                                struct au0828_buffer, vb);
        struct au0828_dev    *dev = vb2_get_drv_priv(vb->vb2_queue);
        buf->length = dev->height * dev->bytesperline;
@@ -668,14 +671,15 @@ buffer_prepare(struct vb2_buffer *vb)
                        __func__, vb2_plane_size(vb, 0), buf->length);
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, buf->length);
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->length);
        return 0;
 }
 static void
 buffer_queue(struct vb2_buffer *vb)
 {
-        struct au0828_buffer    *buf     = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct au0828_buffer    *buf     = container_of(vbuf,
                                                        struct au0828_buffer,
                                                        vb);
        struct au0828_dev       *dev     = vb2_get_drv_priv(vb->vb2_queue);
@@ -826,14 +830,15 @@ static void au0828_stop_streaming(struct vb2_queue *vq)
        spin_lock_irqsave(&dev->slock, flags);
        if (dev->isoc_ctl.buf != NULL) {
-                vb2_buffer_done(&dev->isoc_ctl.buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&dev->isoc_ctl.buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
                dev->isoc_ctl.buf = NULL;
        }
        while (!list_empty(&vidq->active)) {
                struct au0828_buffer *buf;
                buf = list_entry(vidq->active.next, struct au0828_buffer, list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&buf->list);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
@@ -853,7 +858,7 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)
        spin_lock_irqsave(&dev->slock, flags);
        if (dev->isoc_ctl.vbi_buf != NULL) {
-                vb2_buffer_done(&dev->isoc_ctl.vbi_buf->vb,
+                vb2_buffer_done(&dev->isoc_ctl.vbi_buf->vb.vb2_buf,
                                VB2_BUF_STATE_ERROR);
                dev->isoc_ctl.vbi_buf = NULL;
        }
@@ -862,7 +867,7 @@ void au0828_stop_vbi_streaming(struct vb2_queue *vq)
                buf = list_entry(vbiq->active.next, struct au0828_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
@@ -911,7 +916,7 @@ static void au0828_vid_buffer_timeout(unsigned long data)
        buf = dev->isoc_ctl.buf;
        if (buf != NULL) {
-                vid_data = vb2_plane_vaddr(&buf->vb, 0);
+                vid_data = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
                memset(vid_data, 0x00, buf->length); /* Blank green frame */
                buffer_filled(dev, dma_q, buf);
        }
@@ -935,7 +940,7 @@ static void au0828_vbi_buffer_timeout(unsigned long data)
        buf = dev->isoc_ctl.vbi_buf;
        if (buf != NULL) {
-                vbi_data = vb2_plane_vaddr(&buf->vb, 0);
+                vbi_data = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
                memset(vbi_data, 0x00, buf->length);
                buffer_filled(dev, dma_q, buf);
        }
diff --git a/drivers/media/usb/au0828/au0828.h b/drivers/media/usb/au0828/au0828.h
index 3b480005ce3b..60b59391ea2a 100644
--- a/drivers/media/usb/au0828/au0828.h
+++ b/drivers/media/usb/au0828/au0828.h
@@ -28,6 +28,7 @@
 /* Analog */
 #include <linux/videodev2.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
@@ -167,7 +168,7 @@ struct au0828_usb_isoc_ctl {
 /* buffer for one video frame */
 struct au0828_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        void *mem;
diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
index 744e7ed743e1..23a614810166 100644
--- a/drivers/media/usb/em28xx/em28xx-vbi.c
+++ b/drivers/media/usb/em28xx/em28xx-vbi.c
@@ -61,7 +61,6 @@ static int vbi_buffer_prepare(struct vb2_buffer *vb)
 {
        struct em28xx        *dev  = vb2_get_drv_priv(vb->vb2_queue);
        struct em28xx_v4l2   *v4l2 = dev->v4l2;
-        struct em28xx_buffer *buf  = container_of(vb, struct em28xx_buffer, vb);
        unsigned long        size;
        size = v4l2->vbi_width * v4l2->vbi_height * 2;
@@ -71,7 +70,7 @@ static int vbi_buffer_prepare(struct vb2_buffer *vb)
                       __func__, vb2_plane_size(vb, 0), size);
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(vb, 0, size);
        return 0;
 }
@@ -79,8 +78,10 @@ static int vbi_buffer_prepare(struct vb2_buffer *vb)
 static void
 vbi_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct em28xx *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+        struct em28xx_buffer *buf =
+                container_of(vbuf, struct em28xx_buffer, vb);
        struct em28xx_dmaqueue *vbiq = &dev->vbiq;
        unsigned long flags = 0;
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 4397ce5e78df..262e0325297e 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -433,14 +433,14 @@ static inline void finish_buffer(struct em28xx *dev,
 {
        em28xx_isocdbg("[%p/%d] wakeup\n", buf, buf->top_field);
-        buf->vb.v4l2_buf.sequence = dev->v4l2->field_count++;
+        buf->vb.sequence = dev->v4l2->field_count++;
        if (dev->v4l2->progressive)
-                buf->vb.v4l2_buf.field = V4L2_FIELD_NONE;
+                buf->vb.field = V4L2_FIELD_NONE;
        else
-                buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
+                buf->vb.field = V4L2_FIELD_INTERLACED;
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
 }
 /*
@@ -900,12 +900,12 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int
 buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct em28xx        *dev = vb2_get_drv_priv(vb->vb2_queue);
        struct em28xx_v4l2   *v4l2 = dev->v4l2;
-        struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
        unsigned long size;
-        em28xx_videodbg("%s, field=%d\n", __func__, vb->v4l2_buf.field);
+        em28xx_videodbg("%s, field=%d\n", __func__, vbuf->field);
        size = (v4l2->width * v4l2->height * v4l2->format->depth + 7) >> 3;
@@ -914,7 +914,7 @@ buffer_prepare(struct vb2_buffer *vb)
                                __func__, vb2_plane_size(vb, 0), size);
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(vb, 0, size);
        return 0;
 }
@@ -924,6 +924,7 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
        struct em28xx *dev = vb2_get_drv_priv(vq);
        struct em28xx_v4l2 *v4l2 = dev->v4l2;
        struct v4l2_frequency f;
+        struct v4l2_fh *owner;
        int rc = 0;
        em28xx_videodbg("%s\n", __func__);
@@ -964,7 +965,8 @@ int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count)
                /* Ask tuner to go to analog or radio mode */
                memset(&f, 0, sizeof(f));
                f.frequency = v4l2->frequency;
-                if (vq->owner && vq->owner->vdev->vfl_type == VFL_TYPE_RADIO)
+                owner = (struct v4l2_fh *)vq->owner;
+                if (owner && owner->vdev->vfl_type == VFL_TYPE_RADIO)
                        f.type = V4L2_TUNER_RADIO;
                else
                        f.type = V4L2_TUNER_ANALOG_TV;
@@ -995,7 +997,8 @@ static void em28xx_stop_streaming(struct vb2_queue *vq)
        spin_lock_irqsave(&dev->slock, flags);
        if (dev->usb_ctl.vid_buf != NULL) {
-                vb2_buffer_done(&dev->usb_ctl.vid_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&dev->usb_ctl.vid_buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
                dev->usb_ctl.vid_buf = NULL;
        }
        while (!list_empty(&vidq->active)) {
@@ -1003,7 +1006,7 @@ static void em28xx_stop_streaming(struct vb2_queue *vq)
                buf = list_entry(vidq->active.next, struct em28xx_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
@@ -1026,7 +1029,8 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
        spin_lock_irqsave(&dev->slock, flags);
        if (dev->usb_ctl.vbi_buf != NULL) {
-                vb2_buffer_done(&dev->usb_ctl.vbi_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&dev->usb_ctl.vbi_buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
                dev->usb_ctl.vbi_buf = NULL;
        }
        while (!list_empty(&vbiq->active)) {
@@ -1034,7 +1038,7 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
                buf = list_entry(vbiq->active.next, struct em28xx_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->slock, flags);
 }
@@ -1042,8 +1046,10 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
 static void
 buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct em28xx *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct em28xx_buffer *buf = container_of(vb, struct em28xx_buffer, vb);
+        struct em28xx_buffer *buf =
+                container_of(vbuf, struct em28xx_buffer, vb);
        struct em28xx_dmaqueue *vidq = &dev->vidq;
        unsigned long flags = 0;
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index e6559c6f143c..76bf8ba372b3 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -35,6 +35,7 @@
 #include <linux/kref.h>
 #include <linux/videodev2.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
@@ -264,7 +265,7 @@ struct em28xx_fmt {
 /* buffer for one video frame */
 struct em28xx_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        void *mem;
diff --git a/drivers/media/usb/go7007/go7007-driver.c b/drivers/media/usb/go7007/go7007-driver.c
index 0ab81ec8897a..ae1cfa792c58 100644
--- a/drivers/media/usb/go7007/go7007-driver.c
+++ b/drivers/media/usb/go7007/go7007-driver.c
@@ -386,10 +386,10 @@ start_error:
 */
 static inline void store_byte(struct go7007_buffer *vb, u8 byte)
 {
-        if (vb && vb->vb.v4l2_planes[0].bytesused < GO7007_BUF_SIZE) {
+        if (vb && vb->vb.vb2_buf.planes[0].bytesused < GO7007_BUF_SIZE) {
-                u8 *ptr = vb2_plane_vaddr(&vb->vb, 0);
+                u8 *ptr = vb2_plane_vaddr(&vb->vb.vb2_buf, 0);
-                ptr[vb->vb.v4l2_planes[0].bytesused++] = byte;
+                ptr[vb->vb.vb2_buf.planes[0].bytesused++] = byte;
        }
 }
@@ -401,7 +401,7 @@ static void go7007_set_motion_regions(struct go7007 *go, struct go7007_buffer *v
                        .type = V4L2_EVENT_MOTION_DET,
                        .u.motion_det = {
                                .flags = V4L2_EVENT_MD_FL_HAVE_FRAME_SEQ,
-                                .frame_sequence = vb->vb.v4l2_buf.sequence,
+                                .frame_sequence = vb->vb.sequence,
                                .region_mask = motion_regions,
                        },
                };
@@ -417,7 +417,7 @@ static void go7007_set_motion_regions(struct go7007 *go, struct go7007_buffer *v
 */
 static void go7007_motion_regions(struct go7007 *go, struct go7007_buffer *vb)
 {
-        u32 *bytesused = &vb->vb.v4l2_planes[0].bytesused;
+        u32 *bytesused = &vb->vb.vb2_buf.planes[0].bytesused;
        unsigned motion[4] = { 0, 0, 0, 0 };
        u32 motion_regions = 0;
        unsigned stride = (go->width + 7) >> 3;
@@ -458,25 +458,26 @@ static struct go7007_buffer *frame_boundary(struct go7007 *go, struct go7007_buf
                go->next_seq++;
                return vb;
        }
-        bytesused = &vb->vb.v4l2_planes[0].bytesused;
+        bytesused = &vb->vb.vb2_buf.planes[0].bytesused;
-        vb->vb.v4l2_buf.sequence = go->next_seq++;
+        vb->vb.sequence = go->next_seq++;
        if (vb->modet_active && *bytesused + 216 < GO7007_BUF_SIZE)
                go7007_motion_regions(go, vb);
        else
                go7007_set_motion_regions(go, vb, 0);
-        v4l2_get_timestamp(&vb->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vb->vb.timestamp);
        vb_tmp = vb;
        spin_lock(&go->spinlock);
        list_del(&vb->list);
        if (list_empty(&go->vidq_active))
                vb = NULL;
        else
-                vb = list_first_entry(&go->vidq_active, struct go7007_buffer, list);
+                vb = list_first_entry(&go->vidq_active,
+                                struct go7007_buffer, list);
        go->active_buf = vb;
        spin_unlock(&go->spinlock);
-        vb2_buffer_done(&vb_tmp->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&vb_tmp->vb.vb2_buf, VB2_BUF_STATE_DONE);
        return vb;
 }
@@ -519,9 +520,10 @@ void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
        }
        for (i = 0; i < length; ++i) {
-                if (vb && vb->vb.v4l2_planes[0].bytesused >= GO7007_BUF_SIZE - 3) {
+                if (vb && vb->vb.vb2_buf.planes[0].bytesused >=
+                                GO7007_BUF_SIZE - 3) {
                        v4l2_info(&go->v4l2_dev, "dropping oversized frame\n");
-                        vb->vb.v4l2_planes[0].bytesused = 0;
+                        vb->vb.vb2_buf.planes[0].bytesused = 0;
                        vb->frame_offset = 0;
                        vb->modet_active = 0;
                        vb = go->active_buf = NULL;
@@ -601,7 +603,8 @@ void go7007_parse_video_stream(struct go7007 *go, u8 *buf, int length)
                                        vb = frame_boundary(go, vb);
                                go->seen_frame = buf[i] == frame_start_code;
                                if (vb && go->seen_frame)
-                                        vb->frame_offset = vb->vb.v4l2_planes[0].bytesused;
+                                        vb->frame_offset =
+                                        vb->vb.vb2_buf.planes[0].bytesused;
                        }
                        /* Handle any special chunk types, or just write the
                         * start code to the (potentially new) buffer */
diff --git a/drivers/media/usb/go7007/go7007-priv.h b/drivers/media/usb/go7007/go7007-priv.h
index 9e83bbf289d0..745185eb060b 100644
--- a/drivers/media/usb/go7007/go7007-priv.h
+++ b/drivers/media/usb/go7007/go7007-priv.h
@@ -136,7 +136,7 @@ struct go7007_hpi_ops {
 #define GO7007_BUF_SIZE         (GO7007_BUF_PAGES << PAGE_SHIFT)
 struct go7007_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        unsigned int frame_offset;
        u32 modet_active;
diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
index c57207e268c3..63d87a2755ae 100644
--- a/drivers/media/usb/go7007/go7007-v4l2.c
+++ b/drivers/media/usb/go7007/go7007-v4l2.c
@@ -52,7 +52,7 @@ static bool valid_pixelformat(u32 pixelformat)
 static u32 get_frame_type_flag(struct go7007_buffer *vb, int format)
 {
-        u8 *ptr = vb2_plane_vaddr(&vb->vb, 0);
+        u8 *ptr = vb2_plane_vaddr(&vb->vb.vb2_buf, 0);
        switch (format) {
        case V4L2_PIX_FMT_MJPEG:
@@ -386,8 +386,9 @@ static void go7007_buf_queue(struct vb2_buffer *vb)
 {
        struct vb2_queue *vq = vb->vb2_queue;
        struct go7007 *go = vb2_get_drv_priv(vq);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct go7007_buffer *go7007_vb =
-                container_of(vb, struct go7007_buffer, vb);
+                container_of(vbuf, struct go7007_buffer, vb);
        unsigned long flags;
        spin_lock_irqsave(&go->spinlock, flags);
@@ -397,12 +398,13 @@ static void go7007_buf_queue(struct vb2_buffer *vb)
 static int go7007_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct go7007_buffer *go7007_vb =
-                container_of(vb, struct go7007_buffer, vb);
+                container_of(vbuf, struct go7007_buffer, vb);
        go7007_vb->modet_active = 0;
        go7007_vb->frame_offset = 0;
-        vb->v4l2_planes[0].bytesused = 0;
+        vb->planes[0].bytesused = 0;
        return 0;
 }
@@ -410,15 +412,15 @@ static void go7007_buf_finish(struct vb2_buffer *vb)
 {
        struct vb2_queue *vq = vb->vb2_queue;
        struct go7007 *go = vb2_get_drv_priv(vq);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct go7007_buffer *go7007_vb =
-                container_of(vb, struct go7007_buffer, vb);
+                container_of(vbuf, struct go7007_buffer, vb);
        u32 frame_type_flag = get_frame_type_flag(go7007_vb, go->format);
-        struct v4l2_buffer *buf = &vb->v4l2_buf;
-        buf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_BFRAME |
+        vbuf->flags &= ~(V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_BFRAME |
                        V4L2_BUF_FLAG_PFRAME);
-        buf->flags |= frame_type_flag;
+        vbuf->flags |= frame_type_flag;
-        buf->field = V4L2_FIELD_NONE;
+        vbuf->field = V4L2_FIELD_NONE;
 }
 static int go7007_start_streaming(struct vb2_queue *q, unsigned int count)
diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
index fd1fa412e094..e1d4d16ade05 100644
--- a/drivers/media/usb/hackrf/hackrf.c
+++ b/drivers/media/usb/hackrf/hackrf.c
@@ -21,6 +21,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 /* HackRF USB API commands (from HackRF Library) */
@@ -85,7 +86,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
 /* intermediate buffers with raw data from the USB device */
 struct hackrf_frame_buf {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -287,13 +289,13 @@ static void hackrf_urb_complete(struct urb *urb)
                }
                /* fill framebuffer */
-                ptr = vb2_plane_vaddr(&fbuf->vb, 0);
+                ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
                len = hackrf_convert_stream(dev, ptr, urb->transfer_buffer,
                                urb->actual_length);
-                vb2_set_plane_payload(&fbuf->vb, 0, len);
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
-                v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&fbuf->vb.timestamp);
-                fbuf->vb.v4l2_buf.sequence = dev->sequence++;
+                fbuf->vb.sequence = dev->sequence++;
-                vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
 skip:
        usb_submit_urb(urb, GFP_ATOMIC);
@@ -437,7 +439,7 @@ static void hackrf_cleanup_queued_bufs(struct hackrf_dev *dev)
                buf = list_entry(dev->queued_bufs.next,
                                struct hackrf_frame_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->queued_bufs_lock, flags);
 }
@@ -483,9 +485,10 @@ static int hackrf_queue_setup(struct vb2_queue *vq,
 static void hackrf_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct hackrf_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
        struct hackrf_frame_buf *buf =
-                        container_of(vb, struct hackrf_frame_buf, vb);
+                        container_of(vbuf, struct hackrf_frame_buf, vb);
        unsigned long flags;
        spin_lock_irqsave(&dev->queued_bufs_lock, flags);
@@ -539,7 +542,8 @@ err:
                list_for_each_entry_safe(buf, tmp, &dev->queued_bufs, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
        }
diff --git a/drivers/media/usb/msi2500/msi2500.c b/drivers/media/usb/msi2500/msi2500.c
index 3f276d921cca..26a76e0fe3d8 100644
--- a/drivers/media/usb/msi2500/msi2500.c
+++ b/drivers/media/usb/msi2500/msi2500.c
@@ -28,6 +28,7 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
 #include <linux/usb.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <linux/spi/spi.h>
@@ -112,7 +113,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
 /* intermediate buffers with raw data from the USB device */
 struct msi2500_frame_buf {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -431,10 +433,10 @@ static void msi2500_isoc_handler(struct urb *urb)
                }
                /* fill framebuffer */
-                ptr = vb2_plane_vaddr(&fbuf->vb, 0);
+                ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
                flen = msi2500_convert_stream(dev, ptr, iso_buf, flen);
-                vb2_set_plane_payload(&fbuf->vb, 0, flen);
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, flen);
-                vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        }
 handler_end:
@@ -569,7 +571,7 @@ static void msi2500_cleanup_queued_bufs(struct msi2500_dev *dev)
                buf = list_entry(dev->queued_bufs.next,
                                 struct msi2500_frame_buf, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&dev->queued_bufs_lock, flags);
 }
@@ -633,15 +635,16 @@ static int msi2500_queue_setup(struct vb2_queue *vq,
 static void msi2500_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct msi2500_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
-        struct msi2500_frame_buf *buf = container_of(vb,
+        struct msi2500_frame_buf *buf = container_of(vbuf,
                                                     struct msi2500_frame_buf,
                                                     vb);
        unsigned long flags;
        /* Check the device has not disconnected between prep and queuing */
        if (unlikely(!dev->udev)) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                return;
        }
diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c
index 702267e208ba..3f5395a7fafe 100644
--- a/drivers/media/usb/pwc/pwc-if.c
+++ b/drivers/media/usb/pwc/pwc-if.c
@@ -240,9 +240,9 @@ static void pwc_frame_complete(struct pwc_device *pdev)
                        PWC_DEBUG_FLOW("Frame buffer underflow (%d bytes);"
                                       " discarded.\n", fbuf->filled);
                } else {
-                        fbuf->vb.v4l2_buf.field = V4L2_FIELD_NONE;
+                        fbuf->vb.field = V4L2_FIELD_NONE;
-                        fbuf->vb.v4l2_buf.sequence = pdev->vframe_count;
+                        fbuf->vb.sequence = pdev->vframe_count;
-                        vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                        vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
                        pdev->fill_buf = NULL;
                        pdev->vsync = 0;
                }
@@ -287,7 +287,7 @@ static void pwc_isoc_handler(struct urb *urb)
                {
                        PWC_ERROR("Too many ISOC errors, bailing out.\n");
                        if (pdev->fill_buf) {
-                                vb2_buffer_done(&pdev->fill_buf->vb,
+                                vb2_buffer_done(&pdev->fill_buf->vb.vb2_buf,
                                                VB2_BUF_STATE_ERROR);
                                pdev->fill_buf = NULL;
                        }
@@ -317,7 +317,7 @@ static void pwc_isoc_handler(struct urb *urb)
                        if (pdev->vsync == 1) {
                                v4l2_get_timestamp(
-                                        &fbuf->vb.v4l2_buf.timestamp);
+                                        &fbuf->vb.timestamp);
                                pdev->vsync = 2;
                        }
@@ -520,7 +520,7 @@ static void pwc_cleanup_queued_bufs(struct pwc_device *pdev,
                buf = list_entry(pdev->queued_bufs.next, struct pwc_frame_buf,
                                 list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, state);
+                vb2_buffer_done(&buf->vb.vb2_buf, state);
        }
        spin_unlock_irqrestore(&pdev->queued_bufs_lock, flags);
 }
@@ -594,7 +594,9 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int buffer_init(struct vb2_buffer *vb)
 {
-        struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct pwc_frame_buf *buf =
+                container_of(vbuf, struct pwc_frame_buf, vb);
        /* need vmalloc since frame buffer > 128K */
        buf->data = vzalloc(PWC_FRAME_SIZE);
@@ -618,7 +620,9 @@ static int buffer_prepare(struct vb2_buffer *vb)
 static void buffer_finish(struct vb2_buffer *vb)
 {
        struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);
-        struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct pwc_frame_buf *buf =
+                container_of(vbuf, struct pwc_frame_buf, vb);
        if (vb->state == VB2_BUF_STATE_DONE) {
                /*
@@ -633,7 +637,9 @@ static void buffer_finish(struct vb2_buffer *vb)
 static void buffer_cleanup(struct vb2_buffer *vb)
 {
-        struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct pwc_frame_buf *buf =
+                container_of(vbuf, struct pwc_frame_buf, vb);
        vfree(buf->data);
 }
@@ -641,12 +647,14 @@ static void buffer_cleanup(struct vb2_buffer *vb)
 static void buffer_queue(struct vb2_buffer *vb)
 {
        struct pwc_device *pdev = vb2_get_drv_priv(vb->vb2_queue);
-        struct pwc_frame_buf *buf = container_of(vb, struct pwc_frame_buf, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct pwc_frame_buf *buf =
+                container_of(vbuf, struct pwc_frame_buf, vb);
        unsigned long flags = 0;
        /* Check the device has not disconnected between prep and queuing */
        if (!pdev->udev) {
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
                return;
        }
@@ -695,7 +703,8 @@ static void stop_streaming(struct vb2_queue *vq)
        pwc_cleanup_queued_bufs(pdev, VB2_BUF_STATE_ERROR);
        if (pdev->fill_buf)
-                vb2_buffer_done(&pdev->fill_buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&pdev->fill_buf->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        mutex_unlock(&pdev->v4l2_lock);
 }
diff --git a/drivers/media/usb/pwc/pwc-uncompress.c b/drivers/media/usb/pwc/pwc-uncompress.c
index b65903fbcf0d..98c46f93f119 100644
--- a/drivers/media/usb/pwc/pwc-uncompress.c
+++ b/drivers/media/usb/pwc/pwc-uncompress.c
@@ -40,7 +40,7 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
        u16 *src;
        u16 *dsty, *dstu, *dstv;
-        image = vb2_plane_vaddr(&fbuf->vb, 0);
+        image = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
        yuv = fbuf->data + pdev->frame_header_size;  /* Skip header */
@@ -55,12 +55,12 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
                         * determine this using the type of the webcam */
                memcpy(raw_frame->cmd, pdev->cmd_buf, 4);
                memcpy(raw_frame+1, yuv, pdev->frame_size);
-                vb2_set_plane_payload(&fbuf->vb, 0,
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
                        pdev->frame_size + sizeof(struct pwc_raw_frame));
                return 0;
        }
-        vb2_set_plane_payload(&fbuf->vb, 0,
+        vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
                              pdev->width * pdev->height * 3 / 2);
        if (pdev->vbandlength == 0) {
diff --git a/drivers/media/usb/pwc/pwc.h b/drivers/media/usb/pwc/pwc.h
index 81b017a554bc..3c73bdaae450 100644
--- a/drivers/media/usb/pwc/pwc.h
+++ b/drivers/media/usb/pwc/pwc.h
@@ -40,6 +40,7 @@
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-fh.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #ifdef CONFIG_USB_PWC_INPUT_EVDEV
 #include <linux/input.h>
@@ -210,7 +211,8 @@ struct pwc_raw_frame {
 /* intermediate buffers with raw data from the USB cam */
 struct pwc_frame_buf
 {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        void *data;
        int filled;             /* number of bytes filled */
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 0f3c34d47ec3..32b511510f0d 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -45,6 +45,7 @@
 #include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/usb.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
@@ -293,7 +294,7 @@ struct s2255_fmt {
 /* buffer for one video frame */
 struct s2255_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
@@ -573,14 +574,14 @@ static void s2255_got_frame(struct s2255_vc *vc, int jpgsize)
        buf = list_entry(vc->buf_list.next,
                         struct s2255_buffer, list);
        list_del(&buf->list);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        buf->vb.v4l2_buf.field = vc->field;
+        buf->vb.field = vc->field;
-        buf->vb.v4l2_buf.sequence = vc->frame_count;
+        buf->vb.sequence = vc->frame_count;
        spin_unlock_irqrestore(&vc->qlock, flags);
        s2255_fillbuff(vc, buf, jpgsize);
        /* tell v4l buffer was filled */
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        dprintk(dev, 2, "%s: [buf] [%p]\n", __func__, buf);
 }
@@ -612,7 +613,7 @@ static void s2255_fillbuff(struct s2255_vc *vc,
 {
        int pos = 0;
        const char *tmpbuf;
-        char *vbuf = vb2_plane_vaddr(&buf->vb, 0);
+        char *vbuf = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        unsigned long last_frame;
        struct s2255_dev *dev = vc->dev;
@@ -635,7 +636,7 @@ static void s2255_fillbuff(struct s2255_vc *vc,
                        break;
                case V4L2_PIX_FMT_JPEG:
                case V4L2_PIX_FMT_MJPEG:
-                        vb2_set_plane_payload(&buf->vb, 0, jpgsize);
+                        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, jpgsize);
                        memcpy(vbuf, tmpbuf, jpgsize);
                        break;
                case V4L2_PIX_FMT_YUV422P:
@@ -674,7 +675,8 @@ static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int buffer_prepare(struct vb2_buffer *vb)
 {
        struct s2255_vc *vc = vb2_get_drv_priv(vb->vb2_queue);
-        struct s2255_buffer *buf = container_of(vb, struct s2255_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct s2255_buffer *buf = container_of(vbuf, struct s2255_buffer, vb);
        int w = vc->width;
        int h = vc->height;
        unsigned long size;
@@ -696,13 +698,14 @@ static int buffer_prepare(struct vb2_buffer *vb)
                return -EINVAL;
        }
-        vb2_set_plane_payload(&buf->vb, 0, size);
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
        return 0;
 }
 static void buffer_queue(struct vb2_buffer *vb)
 {
-        struct s2255_buffer *buf = container_of(vb, struct s2255_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct s2255_buffer *buf = container_of(vbuf, struct s2255_buffer, vb);
        struct s2255_vc *vc = vb2_get_drv_priv(vb->vb2_queue);
        unsigned long flags = 0;
        dprintk(vc->dev, 1, "%s\n", __func__);
@@ -1116,9 +1119,9 @@ static void stop_streaming(struct vb2_queue *vq)
        spin_lock_irqsave(&vc->qlock, flags);
        list_for_each_entry_safe(buf, node, &vc->buf_list, list) {
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                dprintk(vc->dev, 2, "[%p/%d] done\n",
-                        buf, buf->vb.v4l2_buf.index);
+                        buf, buf->vb.vb2_buf.index);
        }
        spin_unlock_irqrestore(&vc->qlock, flags);
 }
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index e12b10352871..10e35e6479ad 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -695,8 +695,9 @@ static void buffer_queue(struct vb2_buffer *vb)
 {
        unsigned long flags;
        struct stk1160 *dev = vb2_get_drv_priv(vb->vb2_queue);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct stk1160_buffer *buf =
-                container_of(vb, struct stk1160_buffer, vb);
+                container_of(vbuf, struct stk1160_buffer, vb);
        spin_lock_irqsave(&dev->buf_lock, flags);
        if (!dev->udev) {
@@ -704,7 +705,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                 * If the device is disconnected return the buffer to userspace
                 * directly. The next QBUF call will fail with -ENODEV.
                 */
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        } else {
                buf->mem = vb2_plane_vaddr(vb, 0);
@@ -717,7 +718,7 @@ static void buffer_queue(struct vb2_buffer *vb)
                 * the buffer to userspace directly.
                 */
                if (buf->length < dev->width * dev->height * 2)
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                else
                        list_add_tail(&buf->list, &dev->avail_bufs);
@@ -769,9 +770,9 @@ void stk1160_clear_queue(struct stk1160 *dev)
                buf = list_first_entry(&dev->avail_bufs,
                        struct stk1160_buffer, list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                stk1160_dbg("buffer [%p/%d] aborted\n",
-                            buf, buf->vb.v4l2_buf.index);
+                            buf, buf->vb.vb2_buf.index);
        }
        /* It's important to release the current buffer */
@@ -779,9 +780,9 @@ void stk1160_clear_queue(struct stk1160 *dev)
                buf = dev->isoc_ctl.buf;
                dev->isoc_ctl.buf = NULL;
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                stk1160_dbg("buffer [%p/%d] aborted\n",
-                            buf, buf->vb.v4l2_buf.index);
+                            buf, buf->vb.vb2_buf.index);
        }
        spin_unlock_irqrestore(&dev->buf_lock, flags);
 }
diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c
index 940c3eaea507..75654e676e80 100644
--- a/drivers/media/usb/stk1160/stk1160-video.c
+++ b/drivers/media/usb/stk1160/stk1160-video.c
@@ -96,13 +96,13 @@ void stk1160_buffer_done(struct stk1160 *dev)
 {
        struct stk1160_buffer *buf = dev->isoc_ctl.buf;
-        buf->vb.v4l2_buf.sequence = dev->sequence++;
+        buf->vb.sequence = dev->sequence++;
-        buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
+        buf->vb.field = V4L2_FIELD_INTERLACED;
-        buf->vb.v4l2_buf.bytesused = buf->bytesused;
+        buf->vb.vb2_buf.planes[0].bytesused = buf->bytesused;
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
-        vb2_set_plane_payload(&buf->vb, 0, buf->bytesused);
+        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, buf->bytesused);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
        dev->isoc_ctl.buf = NULL;
 }
diff --git a/drivers/media/usb/stk1160/stk1160.h b/drivers/media/usb/stk1160/stk1160.h
index 047131b873f1..1ed1cc43cdb2 100644
--- a/drivers/media/usb/stk1160/stk1160.h
+++ b/drivers/media/usb/stk1160/stk1160.h
@@ -77,7 +77,7 @@
 /* Buffer for one video frame */
 struct stk1160_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
        void *mem;
diff --git a/drivers/media/usb/usbtv/usbtv-video.c b/drivers/media/usb/usbtv/usbtv-video.c
index a46766c9173d..ce5d5028e4c2 100644
--- a/drivers/media/usb/usbtv/usbtv-video.c
+++ b/drivers/media/usb/usbtv/usbtv-video.c
@@ -306,7 +306,7 @@ static void usbtv_image_chunk(struct usbtv *usbtv, __be32 *chunk)
        /* First available buffer. */
        buf = list_first_entry(&usbtv->bufs, struct usbtv_buf, list);
-        frame = vb2_plane_vaddr(&buf->vb, 0);
+        frame = vb2_plane_vaddr(&buf->vb.vb2_buf, 0);
        /* Copy the chunk data. */
        usbtv_chunk_to_vbuf(frame, &chunk[1], chunk_no, odd);
@@ -314,17 +314,17 @@ static void usbtv_image_chunk(struct usbtv *usbtv, __be32 *chunk)
        /* Last chunk in a frame, signalling an end */
        if (odd && chunk_no == usbtv->n_chunks-1) {
-                int size = vb2_plane_size(&buf->vb, 0);
+                int size = vb2_plane_size(&buf->vb.vb2_buf, 0);
                enum vb2_buffer_state state = usbtv->chunks_done ==
                                                usbtv->n_chunks ?
                                                VB2_BUF_STATE_DONE :
                                                VB2_BUF_STATE_ERROR;
-                buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
+                buf->vb.field = V4L2_FIELD_INTERLACED;
-                buf->vb.v4l2_buf.sequence = usbtv->sequence++;
+                buf->vb.sequence = usbtv->sequence++;
-                v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&buf->vb.timestamp);
-                vb2_set_plane_payload(&buf->vb, 0, size);
+                vb2_set_plane_payload(&buf->vb.vb2_buf, 0, size);
-                vb2_buffer_done(&buf->vb, state);
+                vb2_buffer_done(&buf->vb.vb2_buf, state);
                list_del(&buf->list);
        }
@@ -422,7 +422,7 @@ static void usbtv_stop(struct usbtv *usbtv)
        while (!list_empty(&usbtv->bufs)) {
                struct usbtv_buf *buf = list_first_entry(&usbtv->bufs,
                                                struct usbtv_buf, list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
                list_del(&buf->list);
        }
        spin_unlock_irqrestore(&usbtv->buflock, flags);
@@ -617,8 +617,9 @@ static int usbtv_queue_setup(struct vb2_queue *vq,
 static void usbtv_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct usbtv *usbtv = vb2_get_drv_priv(vb->vb2_queue);
-        struct usbtv_buf *buf = container_of(vb, struct usbtv_buf, vb);
+        struct usbtv_buf *buf = container_of(vbuf, struct usbtv_buf, vb);
        unsigned long flags;
        if (usbtv->udev == NULL) {
diff --git a/drivers/media/usb/usbtv/usbtv.h b/drivers/media/usb/usbtv/usbtv.h
index 968119581fab..19cb8bf7c4e9 100644
--- a/drivers/media/usb/usbtv/usbtv.h
+++ b/drivers/media/usb/usbtv/usbtv.h
@@ -24,6 +24,7 @@
 #include <linux/usb.h>
 #include <media/v4l2-device.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 /* Hardware. */
@@ -61,7 +62,7 @@ struct usbtv_norm_params {
 /* A single videobuf2 frame buffer. */
 struct usbtv_buf {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index f16b9b42689d..b49bcab0c38c 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -20,6 +20,7 @@
 #include <linux/videodev2.h>
 #include <linux/vmalloc.h>
 #include <linux/wait.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 #include "uvcvideo.h"
@@ -60,7 +61,7 @@ static void uvc_queue_return_buffers(struct uvc_video_queue *queue,
                                                          queue);
                list_del(&buf->queue);
                buf->state = state;
-                vb2_buffer_done(&buf->buf, vb2_state);
+                vb2_buffer_done(&buf->buf.vb2_buf, vb2_state);
        }
 }
@@ -89,10 +90,11 @@ static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int uvc_buffer_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
            vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {
                uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");
                return -EINVAL;
@@ -105,7 +107,7 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
        buf->error = 0;
        buf->mem = vb2_plane_vaddr(vb, 0);
        buf->length = vb2_plane_size(vb, 0);
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
                buf->bytesused = 0;
        else
                buf->bytesused = vb2_get_plane_payload(vb, 0);
@@ -115,8 +117,9 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
 static void uvc_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
        unsigned long flags;
        spin_lock_irqsave(&queue->irqlock, flags);
@@ -127,7 +130,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
                 * directly. The next QBUF call will fail with -ENODEV.
                 */
                buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&queue->irqlock, flags);
@@ -135,12 +138,13 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
 static void uvc_buffer_finish(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
        struct uvc_streaming *stream = uvc_queue_to_stream(queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
        if (vb->state == VB2_BUF_STATE_DONE)
-                uvc_video_clock_update(stream, &vb->v4l2_buf, buf);
+                uvc_video_clock_update(stream, vbuf, buf);
 }
 static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count)
@@ -398,7 +402,7 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
                buf->error = 0;
                buf->state = UVC_BUF_STATE_QUEUED;
                buf->bytesused = 0;
-                vb2_set_plane_payload(&buf->buf, 0, 0);
+                vb2_set_plane_payload(&buf->buf.vb2_buf, 0, 0);
                return buf;
        }
@@ -412,8 +416,8 @@ struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
        spin_unlock_irqrestore(&queue->irqlock, flags);
        buf->state = buf->error ? VB2_BUF_STATE_ERROR : UVC_BUF_STATE_DONE;
-        vb2_set_plane_payload(&buf->buf, 0, buf->bytesused);
+        vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
-        vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
        return nextbuf;
 }
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 1c4a11766fd1..2b276ab7764f 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -606,7 +606,7 @@ static u16 uvc_video_clock_host_sof(const struct uvc_clock_sample *sample)
 * timestamp of the sliding window to 1s.
 */
 void uvc_video_clock_update(struct uvc_streaming *stream,
-                            struct v4l2_buffer *v4l2_buf,
+                            struct vb2_v4l2_buffer *vbuf,
                            struct uvc_buffer *buf)
 {
        struct uvc_clock *clock = &stream->clock;
@@ -699,14 +699,14 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
                  stream->dev->name,
                  sof >> 16, div_u64(((u64)sof & 0xffff) * 1000000LLU, 65536),
                  y, ts.tv_sec, ts.tv_nsec / NSEC_PER_USEC,
-                  v4l2_buf->timestamp.tv_sec,
+                  vbuf->timestamp.tv_sec,
-                  (unsigned long)v4l2_buf->timestamp.tv_usec,
+                  (unsigned long)vbuf->timestamp.tv_usec,
                  x1, first->host_sof, first->dev_sof,
                  x2, last->host_sof, last->dev_sof, y1, y2);
        /* Update the V4L2 buffer. */
-        v4l2_buf->timestamp.tv_sec = ts.tv_sec;
+        vbuf->timestamp.tv_sec = ts.tv_sec;
-        v4l2_buf->timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+        vbuf->timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
 done:
        spin_unlock_irqrestore(&stream->clock.lock, flags);
@@ -1032,10 +1032,10 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,
                uvc_video_get_ts(&ts);
-                buf->buf.v4l2_buf.field = V4L2_FIELD_NONE;
+                buf->buf.field = V4L2_FIELD_NONE;
-                buf->buf.v4l2_buf.sequence = stream->sequence;
+                buf->buf.sequence = stream->sequence;
-                buf->buf.v4l2_buf.timestamp.tv_sec = ts.tv_sec;
+                buf->buf.timestamp.tv_sec = ts.tv_sec;
-                buf->buf.v4l2_buf.timestamp.tv_usec =
+                buf->buf.timestamp.tv_usec =
                        ts.tv_nsec / NSEC_PER_USEC;
                /* TODO: Handle PTS and SCR. */
@@ -1308,7 +1308,7 @@ static void uvc_video_encode_bulk(struct urb *urb, struct uvc_streaming *stream,
                if (buf->bytesused == stream->queue.buf_used) {
                        stream->queue.buf_used = 0;
                        buf->state = UVC_BUF_STATE_READY;
-                        buf->buf.v4l2_buf.sequence = ++stream->sequence;
+                        buf->buf.sequence = ++stream->sequence;
                        uvc_queue_next_buffer(&stream->queue, buf);
                        stream->last_fid ^= UVC_STREAM_FID;
                }
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 79fa829f42ec..f0f2391e1b43 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -354,7 +354,7 @@ enum uvc_buffer_state {
 };
 struct uvc_buffer {
-        struct vb2_buffer buf;
+        struct vb2_v4l2_buffer buf;
        struct list_head queue;
        enum uvc_buffer_state state;
@@ -674,7 +674,7 @@ extern int uvc_probe_video(struct uvc_streaming *stream,
 extern int uvc_query_ctrl(struct uvc_device *dev, __u8 query, __u8 unit,
                __u8 intfnum, __u8 cs, void *data, __u16 size);
 void uvc_video_clock_update(struct uvc_streaming *stream,
-                            struct v4l2_buffer *v4l2_buf,
+                            struct vb2_v4l2_buffer *vbuf,
                            struct uvc_buffer *buf);
 /* Status */
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index fdcf72c6e486..61d56c940f80 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -766,13 +766,15 @@ EXPORT_SYMBOL_GPL(v4l2_m2m_ctx_release);
 *
 * Call from buf_queue(), videobuf_queue_ops callback.
 */
-void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb)
+void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx,
+                struct vb2_v4l2_buffer *vbuf)
 {
-        struct v4l2_m2m_buffer *b = container_of(vb, struct v4l2_m2m_buffer, vb);
+        struct v4l2_m2m_buffer *b = container_of(vbuf,
+                                struct v4l2_m2m_buffer, vb);
        struct v4l2_m2m_queue_ctx *q_ctx;
        unsigned long flags;
-        q_ctx = get_queue_ctx(m2m_ctx, vb->vb2_queue->type);
+        q_ctx = get_queue_ctx(m2m_ctx, vbuf->vb2_buf.vb2_queue->type);
        if (!q_ctx)
                return;
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index 9518ebd2d73b..8c456f7b1995 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -53,7 +53,7 @@ module_param(debug, int, 0644);
 #define log_memop(vb, op)                                               \
        dprintk(2, "call_memop(%p, %d, %s)%s\n",                        \
-                (vb)->vb2_queue, (vb)->v4l2_buf.index, #op,             \
+                (vb)->vb2_queue, (vb)->index, #op,                      \
                (vb)->vb2_queue->mem_ops->op ? "" : " (nop)")
 #define call_memop(vb, op, args...)                                     \
@@ -115,7 +115,7 @@ module_param(debug, int, 0644);
 #define log_vb_qop(vb, op, args...)                                     \
        dprintk(2, "call_vb_qop(%p, %d, %s)%s\n",                       \
-                (vb)->vb2_queue, (vb)->v4l2_buf.index, #op,             \
+                (vb)->vb2_queue, (vb)->index, #op,                      \
                (vb)->vb2_queue->ops->op ? "" : " (nop)")
 #define call_vb_qop(vb, op, args...)                                    \
@@ -211,7 +211,7 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)
                /* Associate allocator private data with this plane */
                vb->planes[plane].mem_priv = mem_priv;
-                vb->v4l2_planes[plane].length = q->plane_sizes[plane];
+                vb->planes[plane].length = q->plane_sizes[plane];
        }
        return 0;
@@ -235,8 +235,7 @@ static void __vb2_buf_mem_free(struct vb2_buffer *vb)
        for (plane = 0; plane < vb->num_planes; ++plane) {
                call_void_memop(vb, put, vb->planes[plane].mem_priv);
                vb->planes[plane].mem_priv = NULL;
-                dprintk(3, "freed plane %d of buffer %d\n", plane,
+                dprintk(3, "freed plane %d of buffer %d\n", plane, vb->index);
-                        vb->v4l2_buf.index);
        }
 }
@@ -269,7 +268,9 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p)
        call_void_memop(vb, detach_dmabuf, p->mem_priv);
        dma_buf_put(p->dbuf);
-        memset(p, 0, sizeof(*p));
+        p->mem_priv = NULL;
+        p->dbuf = NULL;
+        p->dbuf_mapped = 0;
 }
 /**
@@ -299,7 +300,7 @@ static void __setup_lengths(struct vb2_queue *q, unsigned int n)
                        continue;
                for (plane = 0; plane < vb->num_planes; ++plane)
-                        vb->v4l2_planes[plane].length = q->plane_sizes[plane];
+                        vb->planes[plane].length = q->plane_sizes[plane];
        }
 }
@@ -314,10 +315,10 @@ static void __setup_offsets(struct vb2_queue *q, unsigned int n)
        unsigned long off;
        if (q->num_buffers) {
-                struct v4l2_plane *p;
+                struct vb2_plane *p;
                vb = q->bufs[q->num_buffers - 1];
-                p = &vb->v4l2_planes[vb->num_planes - 1];
+                p = &vb->planes[vb->num_planes - 1];
-                off = PAGE_ALIGN(p->m.mem_offset + p->length);
+                off = PAGE_ALIGN(p->m.offset + p->length);
        } else {
                off = 0;
        }
@@ -328,12 +329,12 @@ static void __setup_offsets(struct vb2_queue *q, unsigned int n)
                        continue;
                for (plane = 0; plane < vb->num_planes; ++plane) {
-                        vb->v4l2_planes[plane].m.mem_offset = off;
+                        vb->planes[plane].m.offset = off;
                        dprintk(3, "buffer %d, plane %d offset 0x%08lx\n",
                                        buffer, plane, off);
-                        off += vb->v4l2_planes[plane].length;
+                        off += vb->planes[plane].length;
                        off = PAGE_ALIGN(off);
                }
        }
@@ -361,16 +362,12 @@ static int __vb2_queue_alloc(struct vb2_queue *q, enum v4l2_memory memory,
                        break;
                }
-                /* Length stores number of planes for multiplanar buffers */
-                if (V4L2_TYPE_IS_MULTIPLANAR(q->type))
-                        vb->v4l2_buf.length = num_planes;
                vb->state = VB2_BUF_STATE_DEQUEUED;
                vb->vb2_queue = q;
                vb->num_planes = num_planes;
-                vb->v4l2_buf.index = q->num_buffers + buffer;
+                vb->index = q->num_buffers + buffer;
-                vb->v4l2_buf.type = q->type;
+                vb->type = q->type;
-                vb->v4l2_buf.memory = memory;
+                vb->memory = memory;
                /* Allocate video buffer memory for the MMAP type */
                if (memory == V4L2_MEMORY_MMAP) {
@@ -592,7 +589,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                        length = (b->memory == V4L2_MEMORY_USERPTR ||
                                  b->memory == V4L2_MEMORY_DMABUF)
                               ? b->m.planes[plane].length
-                               : vb->v4l2_planes[plane].length;
+                                : vb->planes[plane].length;
                        bytesused = b->m.planes[plane].bytesused
                                  ? b->m.planes[plane].bytesused : length;
@@ -605,8 +602,7 @@ static int __verify_length(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                }
        } else {
                length = (b->memory == V4L2_MEMORY_USERPTR)
-                       ? b->length : vb->v4l2_planes[0].length;
+                        ? b->length : vb->planes[0].length;
-                bytesused = b->bytesused ? b->bytesused : length;
                if (b->bytesused > length)
                        return -EINVAL;
@@ -656,12 +652,23 @@ static bool __buffers_in_use(struct vb2_queue *q)
 */
 static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *q = vb->vb2_queue;
+        unsigned int plane;
        /* Copy back data such as timestamp, flags, etc. */
-        memcpy(b, &vb->v4l2_buf, offsetof(struct v4l2_buffer, m));
+        b->index = vb->index;
-        b->reserved2 = vb->v4l2_buf.reserved2;
+        b->type = vb->type;
-        b->reserved = vb->v4l2_buf.reserved;
+        b->memory = vb->memory;
+        b->bytesused = 0;
+        b->flags = vbuf->flags;
+        b->field = vbuf->field;
+        b->timestamp = vbuf->timestamp;
+        b->timecode = vbuf->timecode;
+        b->sequence = vbuf->sequence;
+        b->reserved2 = 0;
+        b->reserved = 0;
        if (V4L2_TYPE_IS_MULTIPLANAR(q->type)) {
                /*
@@ -669,21 +676,34 @@ static void __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b)
                 * for it. The caller has already verified memory and size.
                 */
                b->length = vb->num_planes;
-                memcpy(b->m.planes, vb->v4l2_planes,
+                for (plane = 0; plane < vb->num_planes; ++plane) {
-                        b->length * sizeof(struct v4l2_plane));
+                        struct v4l2_plane *pdst = &b->m.planes[plane];
+                        struct vb2_plane *psrc = &vb->planes[plane];
+                        pdst->bytesused = psrc->bytesused;
+                        pdst->length = psrc->length;
+                        if (q->memory == V4L2_MEMORY_MMAP)
+                                pdst->m.mem_offset = psrc->m.offset;
+                        else if (q->memory == V4L2_MEMORY_USERPTR)
+                                pdst->m.userptr = psrc->m.userptr;
+                        else if (q->memory == V4L2_MEMORY_DMABUF)
+                                pdst->m.fd = psrc->m.fd;
+                        pdst->data_offset = psrc->data_offset;
+                        memset(pdst->reserved, 0, sizeof(pdst->reserved));
+                }
        } else {
                /*
                 * We use length and offset in v4l2_planes array even for
                 * single-planar buffers, but userspace does not.
                 */
-                b->length = vb->v4l2_planes[0].length;
+                b->length = vb->planes[0].length;
-                b->bytesused = vb->v4l2_planes[0].bytesused;
+                b->bytesused = vb->planes[0].bytesused;
                if (q->memory == V4L2_MEMORY_MMAP)
-                        b->m.offset = vb->v4l2_planes[0].m.mem_offset;
+                        b->m.offset = vb->planes[0].m.offset;
                else if (q->memory == V4L2_MEMORY_USERPTR)
-                        b->m.userptr = vb->v4l2_planes[0].m.userptr;
+                        b->m.userptr = vb->planes[0].m.userptr;
                else if (q->memory == V4L2_MEMORY_DMABUF)
-                        b->m.fd = vb->v4l2_planes[0].m.fd;
+                        b->m.fd = vb->planes[0].m.fd;
        }
        /*
@@ -1197,7 +1217,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state)
        vb->cnt_buf_done++;
 #endif
        dprintk(4, "done processing on buffer %d, state: %d\n",
-                        vb->v4l2_buf.index, state);
+                        vb->index, state);
        /* sync buffers */
        for (plane = 0; plane < vb->num_planes; ++plane)
@@ -1278,25 +1298,26 @@ static void vb2_warn_zero_bytesused(struct vb2_buffer *vb)
 * v4l2_buffer by the userspace. The caller has already verified that struct
 * v4l2_buffer has a valid number of planes.
 */
-static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b,
+static void __fill_vb2_buffer(struct vb2_buffer *vb,
-                                struct v4l2_plane *v4l2_planes)
+                const struct v4l2_buffer *b, struct vb2_plane *planes)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        unsigned int plane;
        if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
                if (b->memory == V4L2_MEMORY_USERPTR) {
                        for (plane = 0; plane < vb->num_planes; ++plane) {
-                                v4l2_planes[plane].m.userptr =
+                                planes[plane].m.userptr =
                                        b->m.planes[plane].m.userptr;
-                                v4l2_planes[plane].length =
+                                planes[plane].length =
                                        b->m.planes[plane].length;
                        }
                }
                if (b->memory == V4L2_MEMORY_DMABUF) {
                        for (plane = 0; plane < vb->num_planes; ++plane) {
-                                v4l2_planes[plane].m.fd =
+                                planes[plane].m.fd =
                                        b->m.planes[plane].m.fd;
-                                v4l2_planes[plane].length =
+                                planes[plane].length =
                                        b->m.planes[plane].length;
                        }
                }
@@ -1320,7 +1341,7 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
                         * applications working.
                         */
                        for (plane = 0; plane < vb->num_planes; ++plane) {
-                                struct v4l2_plane *pdst = &v4l2_planes[plane];
+                                struct vb2_plane *pdst = &planes[plane];
                                struct v4l2_plane *psrc = &b->m.planes[plane];
                                if (psrc->bytesused == 0)
@@ -1350,13 +1371,13 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
                 * old userspace applications working.
                 */
                if (b->memory == V4L2_MEMORY_USERPTR) {
-                        v4l2_planes[0].m.userptr = b->m.userptr;
+                        planes[0].m.userptr = b->m.userptr;
-                        v4l2_planes[0].length = b->length;
+                        planes[0].length = b->length;
                }
                if (b->memory == V4L2_MEMORY_DMABUF) {
-                        v4l2_planes[0].m.fd = b->m.fd;
+                        planes[0].m.fd = b->m.fd;
-                        v4l2_planes[0].length = b->length;
+                        planes[0].length = b->length;
                }
                if (V4L2_TYPE_IS_OUTPUT(b->type)) {
@@ -1364,17 +1385,17 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
                                vb2_warn_zero_bytesused(vb);
                        if (vb->vb2_queue->allow_zero_bytesused)
-                                v4l2_planes[0].bytesused = b->bytesused;
+                                planes[0].bytesused = b->bytesused;
                        else
-                                v4l2_planes[0].bytesused = b->bytesused ?
+                                planes[0].bytesused = b->bytesused ?
-                                        b->bytesused : v4l2_planes[0].length;
+                                        b->bytesused : planes[0].length;
                } else
-                        v4l2_planes[0].bytesused = 0;
+                        planes[0].bytesused = 0;
        }
        /* Zero flags that the vb2 core handles */
-        vb->v4l2_buf.flags = b->flags & ~V4L2_BUFFER_MASK_FLAGS;
+        vbuf->flags = b->flags & ~V4L2_BUFFER_MASK_FLAGS;
        if ((vb->vb2_queue->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) !=
            V4L2_BUF_FLAG_TIMESTAMP_COPY || !V4L2_TYPE_IS_OUTPUT(b->type)) {
                /*
@@ -1382,7 +1403,7 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
                 * their timestamp and timestamp source flags from the
                 * queue.
                 */
-                vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
+                vbuf->flags &= ~V4L2_BUF_FLAG_TSTAMP_SRC_MASK;
        }
        if (V4L2_TYPE_IS_OUTPUT(b->type)) {
@@ -1392,11 +1413,11 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
                 * The 'field' is valid metadata for this output buffer
                 * and so that needs to be copied here.
                 */
-                vb->v4l2_buf.flags &= ~V4L2_BUF_FLAG_TIMECODE;
+                vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
-                vb->v4l2_buf.field = b->field;
+                vbuf->field = b->field;
        } else {
                /* Zero any output buffer flags as this is a capture buffer */
-                vb->v4l2_buf.flags &= ~V4L2_BUFFER_OUT_FLAGS;
+                vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
        }
 }
@@ -1405,7 +1426,7 @@ static void __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b
 */
 static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
-        __fill_vb2_buffer(vb, b, vb->v4l2_planes);
+        __fill_vb2_buffer(vb, b, vb->planes);
        return call_vb_qop(vb, buf_prepare, vb);
 }
@@ -1414,7 +1435,7 @@ static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 */
 static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
-        struct v4l2_plane planes[VIDEO_MAX_PLANES];
+        struct vb2_plane planes[VIDEO_MAX_PLANES];
        struct vb2_queue *q = vb->vb2_queue;
        void *mem_priv;
        unsigned int plane;
@@ -1429,9 +1450,9 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
        for (plane = 0; plane < vb->num_planes; ++plane) {
                /* Skip the plane if already verified */
-                if (vb->v4l2_planes[plane].m.userptr &&
+                if (vb->planes[plane].m.userptr &&
-                    vb->v4l2_planes[plane].m.userptr == planes[plane].m.userptr
+                        vb->planes[plane].m.userptr == planes[plane].m.userptr
-                    && vb->v4l2_planes[plane].length == planes[plane].length)
+                        && vb->planes[plane].length == planes[plane].length)
                        continue;
                dprintk(3, "userspace address for plane %d changed, "
@@ -1457,7 +1478,10 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                }
                vb->planes[plane].mem_priv = NULL;
-                memset(&vb->v4l2_planes[plane], 0, sizeof(struct v4l2_plane));
+                vb->planes[plane].bytesused = 0;
+                vb->planes[plane].length = 0;
+                vb->planes[plane].m.userptr = 0;
+                vb->planes[plane].data_offset = 0;
                /* Acquire each plane's memory */
                mem_priv = call_ptr_memop(vb, get_userptr, q->alloc_ctx[plane],
@@ -1476,8 +1500,12 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
         * Now that everything is in order, copy relevant information
         * provided by userspace.
         */
-        for (plane = 0; plane < vb->num_planes; ++plane)
+        for (plane = 0; plane < vb->num_planes; ++plane) {
-                vb->v4l2_planes[plane] = planes[plane];
+                vb->planes[plane].bytesused = planes[plane].bytesused;
+                vb->planes[plane].length = planes[plane].length;
+                vb->planes[plane].m.userptr = planes[plane].m.userptr;
+                vb->planes[plane].data_offset = planes[plane].data_offset;
+        }
        if (reacquired) {
                /*
@@ -1504,10 +1532,11 @@ err:
        /* In case of errors, release planes that were already acquired */
        for (plane = 0; plane < vb->num_planes; ++plane) {
                if (vb->planes[plane].mem_priv)
-                        call_void_memop(vb, put_userptr, vb->planes[plane].mem_priv);
+                        call_void_memop(vb, put_userptr,
+                                vb->planes[plane].mem_priv);
                vb->planes[plane].mem_priv = NULL;
-                vb->v4l2_planes[plane].m.userptr = 0;
+                vb->planes[plane].m.userptr = 0;
-                vb->v4l2_planes[plane].length = 0;
+                vb->planes[plane].length = 0;
        }
        return ret;
@@ -1518,7 +1547,7 @@ err:
 */
 static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
-        struct v4l2_plane planes[VIDEO_MAX_PLANES];
+        struct vb2_plane planes[VIDEO_MAX_PLANES];
        struct vb2_queue *q = vb->vb2_queue;
        void *mem_priv;
        unsigned int plane;
@@ -1554,7 +1583,7 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                /* Skip the plane if already verified */
                if (dbuf == vb->planes[plane].dbuf &&
-                    vb->v4l2_planes[plane].length == planes[plane].length) {
+                        vb->planes[plane].length == planes[plane].length) {
                        dma_buf_put(dbuf);
                        continue;
                }
@@ -1568,11 +1597,15 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                /* Release previously acquired memory if present */
                __vb2_plane_dmabuf_put(vb, &vb->planes[plane]);
-                memset(&vb->v4l2_planes[plane], 0, sizeof(struct v4l2_plane));
+                vb->planes[plane].bytesused = 0;
+                vb->planes[plane].length = 0;
+                vb->planes[plane].m.fd = 0;
+                vb->planes[plane].data_offset = 0;
                /* Acquire each plane's memory */
-                mem_priv = call_ptr_memop(vb, attach_dmabuf, q->alloc_ctx[plane],
+                mem_priv = call_ptr_memop(vb, attach_dmabuf,
-                        dbuf, planes[plane].length, dma_dir);
+                        q->alloc_ctx[plane], dbuf, planes[plane].length,
+                        dma_dir);
                if (IS_ERR(mem_priv)) {
                        dprintk(1, "failed to attach dmabuf\n");
                        ret = PTR_ERR(mem_priv);
@@ -1602,8 +1635,12 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
         * Now that everything is in order, copy relevant information
         * provided by userspace.
         */
-        for (plane = 0; plane < vb->num_planes; ++plane)
+        for (plane = 0; plane < vb->num_planes; ++plane) {
-                vb->v4l2_planes[plane] = planes[plane];
+                vb->planes[plane].bytesused = planes[plane].bytesused;
+                vb->planes[plane].length = planes[plane].length;
+                vb->planes[plane].m.fd = planes[plane].m.fd;
+                vb->planes[plane].data_offset = planes[plane].data_offset;
+        }
        if (reacquired) {
                /*
@@ -1654,6 +1691,7 @@ static void __enqueue_in_driver(struct vb2_buffer *vb)
 static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vb2_queue *q = vb->vb2_queue;
        int ret;
@@ -1682,9 +1720,9 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b)
        }
        vb->state = VB2_BUF_STATE_PREPARING;
-        vb->v4l2_buf.timestamp.tv_sec = 0;
+        vbuf->timestamp.tv_sec = 0;
-        vb->v4l2_buf.timestamp.tv_usec = 0;
+        vbuf->timestamp.tv_usec = 0;
-        vb->v4l2_buf.sequence = 0;
+        vbuf->sequence = 0;
        switch (q->memory) {
        case V4L2_MEMORY_MMAP:
@@ -1776,7 +1814,7 @@ int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b)
                /* Fill buffer information for the userspace */
                __fill_v4l2_buffer(vb, b);
-                dprintk(1, "prepare of buffer %d succeeded\n", vb->v4l2_buf.index);
+                dprintk(1, "prepare of buffer %d succeeded\n", vb->index);
        }
        return ret;
 }
@@ -1818,7 +1856,7 @@ static int vb2_start_streaming(struct vb2_queue *q)
        /*
         * If you see this warning, then the driver isn't cleaning up properly
         * after a failed start_streaming(). See the start_streaming()
-         * documentation in videobuf2-v4l2.h for more information how buffers
+         * documentation in videobuf2-core.h for more information how buffers
         * should be returned to vb2 in start_streaming().
         */
        if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
@@ -1849,11 +1887,13 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
 {
        int ret = vb2_queue_or_prepare_buf(q, b, "qbuf");
        struct vb2_buffer *vb;
+        struct vb2_v4l2_buffer *vbuf;
        if (ret)
                return ret;
        vb = q->bufs[b->index];
+        vbuf = to_vb2_v4l2_buffer(vb);
        switch (vb->state) {
        case VB2_BUF_STATE_DEQUEUED:
@@ -1886,10 +1926,10 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
                 */
                if ((q->timestamp_flags & V4L2_BUF_FLAG_TIMESTAMP_MASK) ==
                    V4L2_BUF_FLAG_TIMESTAMP_COPY)
-                        vb->v4l2_buf.timestamp = b->timestamp;
+                        vbuf->timestamp = b->timestamp;
-                vb->v4l2_buf.flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
+                vbuf->flags |= b->flags & V4L2_BUF_FLAG_TIMECODE;
                if (b->flags & V4L2_BUF_FLAG_TIMECODE)
-                        vb->v4l2_buf.timecode = b->timecode;
+                        vbuf->timecode = b->timecode;
        }
        trace_vb2_qbuf(q, vb);
@@ -1917,7 +1957,7 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)
                        return ret;
        }
-        dprintk(1, "qbuf of buffer %d succeeded\n", vb->v4l2_buf.index);
+        dprintk(1, "qbuf of buffer %d succeeded\n", vb->index);
        return 0;
 }
@@ -2107,9 +2147,11 @@ static void __vb2_dqbuf(struct vb2_buffer *vb)
                }
 }
-static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking)
+static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b,
+                bool nonblocking)
 {
        struct vb2_buffer *vb = NULL;
+        struct vb2_v4l2_buffer *vbuf = NULL;
        int ret;
        if (b->type != q->type) {
@@ -2142,14 +2184,15 @@ static int vb2_internal_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool n
        trace_vb2_dqbuf(q, vb);
+        vbuf = to_vb2_v4l2_buffer(vb);
        if (!V4L2_TYPE_IS_OUTPUT(q->type) &&
-            vb->v4l2_buf.flags & V4L2_BUF_FLAG_LAST)
+                        vbuf->flags & V4L2_BUF_FLAG_LAST)
                q->last_buffer_dequeued = true;
        /* go back to dequeued state */
        __vb2_dqbuf(vb);
        dprintk(1, "dqbuf of buffer %d, with state %d\n",
-                        vb->v4l2_buf.index, vb->state);
+                        vb->index, vb->state);
        return 0;
 }
@@ -2205,7 +2248,7 @@ static void __vb2_queue_cancel(struct vb2_queue *q)
        /*
         * If you see this warning, then the driver isn't cleaning up properly
         * in stop_streaming(). See the stop_streaming() documentation in
-         * videobuf2-v4l2.h for more information how buffers should be returned
+         * videobuf2-core.h for more information how buffers should be returned
         * to vb2 in stop_streaming().
         */
        if (WARN_ON(atomic_read(&q->owned_by_drv_count))) {
@@ -2407,7 +2450,7 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off,
                vb = q->bufs[buffer];
                for (plane = 0; plane < vb->num_planes; ++plane) {
-                        if (vb->v4l2_planes[plane].m.mem_offset == off) {
+                        if (vb->planes[plane].m.offset == off) {
                                *_buffer = buffer;
                                *_plane = plane;
                                return 0;
@@ -2565,7 +2608,7 @@ int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma)
         * The buffer length was page_aligned at __vb2_buf_mem_alloc(),
         * so, we need to do the same here.
         */
-        length = PAGE_ALIGN(vb->v4l2_planes[plane].length);
+        length = PAGE_ALIGN(vb->planes[plane].length);
        if (length < (vma->vm_end - vma->vm_start)) {
                dprintk(1,
                        "MMAP invalid, as it would overflow buffer length\n");
@@ -2739,7 +2782,7 @@ EXPORT_SYMBOL_GPL(vb2_poll);
 * responsible of clearing it's content and setting initial values for some
 * required entries before calling this function.
 * q->ops, q->mem_ops, q->type and q->io_modes are mandatory. Please refer
- * to the struct vb2_queue description in include/media/videobuf2-v4l2.h
+ * to the struct vb2_queue description in include/media/videobuf2-core.h
 * for more information.
 */
 int vb2_queue_init(struct vb2_queue *q)
@@ -2770,7 +2813,7 @@ int vb2_queue_init(struct vb2_queue *q)
        init_waitqueue_head(&q->done_wq);
        if (q->buf_struct_size == 0)
-                q->buf_struct_size = sizeof(struct vb2_buffer);
+                q->buf_struct_size = sizeof(struct vb2_v4l2_buffer);
        return 0;
 }
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 87048a14c34d..fbcc1c3e91d5 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -428,8 +428,8 @@ vpfe_video_get_next_buffer(struct vpfe_video_device *video)
                           struct vpfe_cap_buffer, list);
        list_del(&video->next_frm->list);
-        video->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        video->next_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
-        return vb2_dma_contig_plane_dma_addr(&video->next_frm->vb, 0);
+        return vb2_dma_contig_plane_dma_addr(&video->next_frm->vb.vb2_buf, 0);
 }
 /* schedule the next buffer which is available on dma queue */
@@ -448,8 +448,8 @@ void vpfe_video_schedule_next_buffer(struct vpfe_video_device *video)
                video->cur_frm = video->next_frm;
        list_del(&video->next_frm->list);
-        video->next_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        video->next_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
-        addr = vb2_dma_contig_plane_dma_addr(&video->next_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&video->next_frm->vb.vb2_buf, 0);
        video->ops->queue(vpfe_dev, addr);
        video->state = VPFE_VIDEO_BUFFER_QUEUED;
 }
@@ -460,7 +460,7 @@ void vpfe_video_schedule_bottom_field(struct vpfe_video_device *video)
        struct vpfe_device *vpfe_dev = video->vpfe_dev;
        unsigned long addr;
-        addr = vb2_dma_contig_plane_dma_addr(&video->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&video->cur_frm->vb.vb2_buf, 0);
        addr += video->field_off;
        video->ops->queue(vpfe_dev, addr);
 }
@@ -470,8 +470,8 @@ void vpfe_video_process_buffer_complete(struct vpfe_video_device *video)
 {
        struct vpfe_pipeline *pipe = &video->pipe;
-        v4l2_get_timestamp(&video->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&video->cur_frm->vb.timestamp);
-        vb2_buffer_done(&video->cur_frm->vb, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&video->cur_frm->vb.vb2_buf, VB2_BUF_STATE_DONE);
        if (pipe->state == VPFE_PIPELINE_STREAM_CONTINUOUS)
                video->cur_frm = video->next_frm;
 }
@@ -1138,12 +1138,13 @@ static int vpfe_buffer_prepare(struct vb2_buffer *vb)
 static void vpfe_buffer_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        /* Get the file handle object and device object */
        struct vpfe_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
        struct vpfe_video_device *video = fh->video;
        struct vpfe_device *vpfe_dev = video->vpfe_dev;
        struct vpfe_pipeline *pipe = &video->pipe;
-        struct vpfe_cap_buffer *buf = container_of(vb,
+        struct vpfe_cap_buffer *buf = container_of(vbuf,
                                struct vpfe_cap_buffer, vb);
        unsigned long flags;
        unsigned long empty;
@@ -1203,10 +1204,10 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
        /* Remove buffer from the buffer queue */
        list_del(&video->cur_frm->list);
        /* Mark state of the current frame to active */
-        video->cur_frm->vb.state = VB2_BUF_STATE_ACTIVE;
+        video->cur_frm->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
        /* Initialize field_id and started member */
        video->field_id = 0;
-        addr = vb2_dma_contig_plane_dma_addr(&video->cur_frm->vb, 0);
+        addr = vb2_dma_contig_plane_dma_addr(&video->cur_frm->vb.vb2_buf, 0);
        video->ops->queue(vpfe_dev, addr);
        video->state = VPFE_VIDEO_BUFFER_QUEUED;
@@ -1214,10 +1215,12 @@ static int vpfe_start_streaming(struct vb2_queue *vq, unsigned int count)
        if (ret) {
                struct vpfe_cap_buffer *buf, *tmp;
-                vb2_buffer_done(&video->cur_frm->vb, VB2_BUF_STATE_QUEUED);
+                vb2_buffer_done(&video->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_QUEUED);
                list_for_each_entry_safe(buf, tmp, &video->dma_queue, list) {
                        list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                }
                goto unlock_out;
        }
@@ -1234,7 +1237,8 @@ streamoff:
 static int vpfe_buffer_init(struct vb2_buffer *vb)
 {
-        struct vpfe_cap_buffer *buf = container_of(vb,
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct vpfe_cap_buffer *buf = container_of(vbuf,
                                                   struct vpfe_cap_buffer, vb);
        INIT_LIST_HEAD(&buf->list);
@@ -1249,13 +1253,14 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
        /* release all active buffers */
        if (video->cur_frm == video->next_frm) {
-                vb2_buffer_done(&video->cur_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&video->cur_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        } else {
                if (video->cur_frm != NULL)
-                        vb2_buffer_done(&video->cur_frm->vb,
+                        vb2_buffer_done(&video->cur_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
                if (video->next_frm != NULL)
-                        vb2_buffer_done(&video->next_frm->vb,
+                        vb2_buffer_done(&video->next_frm->vb.vb2_buf,
                                        VB2_BUF_STATE_ERROR);
        }
@@ -1263,16 +1268,18 @@ static void vpfe_stop_streaming(struct vb2_queue *vq)
                video->next_frm = list_entry(video->dma_queue.next,
                                                struct vpfe_cap_buffer, list);
                list_del(&video->next_frm->list);
-                vb2_buffer_done(&video->next_frm->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&video->next_frm->vb.vb2_buf,
+                                VB2_BUF_STATE_ERROR);
        }
 }
 static void vpfe_buf_cleanup(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct vpfe_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
        struct vpfe_video_device *video = fh->video;
        struct vpfe_device *vpfe_dev = video->vpfe_dev;
-        struct vpfe_cap_buffer *buf = container_of(vb,
+        struct vpfe_cap_buffer *buf = container_of(vbuf,
                                        struct vpfe_cap_buffer, vb);
        v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_buf_cleanup\n");
diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.h b/drivers/staging/media/davinci_vpfe/vpfe_video.h
index 1b1b6c4a56b7..673cefe3ef61 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.h
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.h
@@ -22,6 +22,7 @@
 #ifndef _DAVINCI_VPFE_VIDEO_H
 #define _DAVINCI_VPFE_VIDEO_H
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 struct vpfe_device;
@@ -72,7 +73,7 @@ struct vpfe_pipeline {
        container_of(vdev, struct vpfe_video_device, video_dev)
 struct vpfe_cap_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 485a90ce12df..72b4ca8934f8 100644
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -311,7 +311,8 @@ static int iss_video_queue_setup(struct vb2_queue *vq,
 static void iss_video_buf_cleanup(struct vb2_buffer *vb)
 {
-        struct iss_buffer *buffer = container_of(vb, struct iss_buffer, vb);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb);
        if (buffer->iss_addr)
                buffer->iss_addr = 0;
@@ -319,8 +320,9 @@ static void iss_video_buf_cleanup(struct vb2_buffer *vb)
 static int iss_video_buf_prepare(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct iss_video_fh *vfh = vb2_get_drv_priv(vb->vb2_queue);
-        struct iss_buffer *buffer = container_of(vb, struct iss_buffer, vb);
+        struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb);
        struct iss_video *video = vfh->video;
        unsigned long size = vfh->format.fmt.pix.sizeimage;
        dma_addr_t addr;
@@ -342,9 +344,10 @@ static int iss_video_buf_prepare(struct vb2_buffer *vb)
 static void iss_video_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
        struct iss_video_fh *vfh = vb2_get_drv_priv(vb->vb2_queue);
        struct iss_video *video = vfh->video;
-        struct iss_buffer *buffer = container_of(vb, struct iss_buffer, vb);
+        struct iss_buffer *buffer = container_of(vbuf, struct iss_buffer, vb);
        struct iss_pipeline *pipe = to_iss_pipeline(&video->video.entity);
        unsigned long flags;
        bool empty;
@@ -432,7 +435,7 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
        list_del(&buf->list);
        spin_unlock_irqrestore(&video->qlock, flags);
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.timestamp);
        /* Do frame number propagation only if this is the output video node.
         * Frame number either comes from the CSI receivers or it gets
@@ -441,12 +444,12 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
         * first, so the input number might lag behind by 1 in some cases.
         */
        if (video == pipe->output && !pipe->do_propagation)
-                buf->vb.v4l2_buf.sequence =
+                buf->vb.sequence =
                        atomic_inc_return(&pipe->frame_number);
        else
-                buf->vb.v4l2_buf.sequence = atomic_read(&pipe->frame_number);
+                buf->vb.sequence = atomic_read(&pipe->frame_number);
-        vb2_buffer_done(&buf->vb, pipe->error ?
+        vb2_buffer_done(&buf->vb.vb2_buf, pipe->error ?
                        VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
        pipe->error = false;
@@ -477,7 +480,7 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
        buf = list_first_entry(&video->dmaqueue, struct iss_buffer,
                               list);
        spin_unlock_irqrestore(&video->qlock, flags);
-        buf->vb.state = VB2_BUF_STATE_ACTIVE;
+        buf->vb.vb2_buf.state = VB2_BUF_STATE_ACTIVE;
        return buf;
 }
@@ -500,7 +503,7 @@ void omap4iss_video_cancel_stream(struct iss_video *video)
                buf = list_first_entry(&video->dmaqueue, struct iss_buffer,
                                       list);
                list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        vb2_queue_error(video->queue);
diff --git a/drivers/staging/media/omap4iss/iss_video.h b/drivers/staging/media/omap4iss/iss_video.h
index 6a57b5648e4d..41532eda1277 100644
--- a/drivers/staging/media/omap4iss/iss_video.h
+++ b/drivers/staging/media/omap4iss/iss_video.h
@@ -117,12 +117,12 @@ static inline int iss_pipeline_ready(struct iss_pipeline *pipe)
 */
 struct iss_buffer {
        /* common v4l buffer stuff -- must be first */
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer  vb;
        struct list_head        list;
        dma_addr_t iss_addr;
 };
-#define to_iss_buffer(buf)      container_of(buf, struct iss_buffer, buffer)
+#define to_iss_buffer(buf)      container_of(buf, struct iss_buffer, vb)
 enum iss_video_dmaqueue_flags {
        /* Set if DMA queue becomes empty when ISS_PIPELINE_STREAM_CONTINUOUS */
diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index d617c39a0052..3628938785ac 100644
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -61,9 +61,10 @@ static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int uvc_buffer_prepare(struct vb2_buffer *vb)
 {
        struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
            vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {
                uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");
                return -EINVAL;
@@ -75,7 +76,7 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
        buf->state = UVC_BUF_STATE_QUEUED;
        buf->mem = vb2_plane_vaddr(vb, 0);
        buf->length = vb2_plane_size(vb, 0);
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
                buf->bytesused = 0;
        else
                buf->bytesused = vb2_get_plane_payload(vb, 0);
@@ -86,7 +87,8 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
 static void uvc_buffer_queue(struct vb2_buffer *vb)
 {
        struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
        unsigned long flags;
        spin_lock_irqsave(&queue->irqlock, flags);
@@ -98,7 +100,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
                 * directly. The next QBUF call will fail with -ENODEV.
                 */
                buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
        }
        spin_unlock_irqrestore(&queue->irqlock, flags);
@@ -242,7 +244,7 @@ void uvcg_queue_cancel(struct uvc_video_queue *queue, int disconnect)
                                       queue);
                list_del(&buf->queue);
                buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
        }
        /* This must be protected by the irqlock spinlock to avoid race
         * conditions between uvc_queue_buffer and the disconnection event that
@@ -314,7 +316,7 @@ struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
        if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) &&
             buf->length != buf->bytesused) {
                buf->state = UVC_BUF_STATE_QUEUED;
-                vb2_set_plane_payload(&buf->buf, 0, 0);
+                vb2_set_plane_payload(&buf->buf.vb2_buf, 0, 0);
                return buf;
        }
@@ -325,12 +327,12 @@ struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
        else
                nextbuf = NULL;
-        buf->buf.v4l2_buf.field = V4L2_FIELD_NONE;
+        buf->buf.field = V4L2_FIELD_NONE;
-        buf->buf.v4l2_buf.sequence = queue->sequence++;
+        buf->buf.sequence = queue->sequence++;
-        v4l2_get_timestamp(&buf->buf.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->buf.timestamp);
-        vb2_set_plane_payload(&buf->buf, 0, buf->bytesused);
+        vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
-        vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE);
+        vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
        return nextbuf;
 }
diff --git a/drivers/usb/gadget/function/uvc_queue.h b/drivers/usb/gadget/function/uvc_queue.h
index 0ffe498eaacd..ac461a9a1a70 100644
--- a/drivers/usb/gadget/function/uvc_queue.h
+++ b/drivers/usb/gadget/function/uvc_queue.h
@@ -26,7 +26,7 @@ enum uvc_buffer_state {
 };
 struct uvc_buffer {
-        struct vb2_buffer buf;
+        struct vb2_v4l2_buffer buf;
        struct list_head queue;
        enum uvc_buffer_state state;
diff --git a/include/media/davinci/vpbe_display.h b/include/media/davinci/vpbe_display.h
index fa0247ad815f..e14a9370b67e 100644
--- a/include/media/davinci/vpbe_display.h
+++ b/include/media/davinci/vpbe_display.h
@@ -17,6 +17,7 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-fh.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-dma-contig.h>
 #include <media/davinci/vpbe_types.h>
 #include <media/davinci/vpbe_osd.h>
@@ -64,7 +65,7 @@ struct display_layer_info {
 };
 struct vpbe_disp_buffer {
-        struct vb2_buffer vb;
+        struct vb2_v4l2_buffer vb;
        struct list_head list;
 };
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 5c60da9986c1..5a9597dd1ee0 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -90,7 +90,7 @@ struct v4l2_m2m_ctx {
 };
 struct v4l2_m2m_buffer {
-        struct vb2_buffer       vb;
+        struct vb2_v4l2_buffer  vb;
        struct list_head        list;
 };
@@ -105,9 +105,9 @@ void v4l2_m2m_job_finish(struct v4l2_m2m_dev *m2m_dev,
                         struct v4l2_m2m_ctx *m2m_ctx);
 static inline void
-v4l2_m2m_buf_done(struct vb2_buffer *buf, enum vb2_buffer_state state)
+v4l2_m2m_buf_done(struct vb2_v4l2_buffer *buf, enum vb2_buffer_state state)
 {
-        vb2_buffer_done(buf, state);
+        vb2_buffer_done(&buf->vb2_buf, state);
 }
 int v4l2_m2m_reqbufs(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
@@ -160,7 +160,8 @@ static inline void v4l2_m2m_set_dst_buffered(struct v4l2_m2m_ctx *m2m_ctx,
 void v4l2_m2m_ctx_release(struct v4l2_m2m_ctx *m2m_ctx);
-void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, struct vb2_buffer *vb);
+void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx,
+                        struct vb2_v4l2_buffer *vbuf);
 /**
 * v4l2_m2m_num_src_bufs_ready() - return the number of source buffers ready for
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 19990d7bf270..108fa160168a 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -111,10 +111,38 @@ struct vb2_mem_ops {
        int             (*mmap)(void *buf_priv, struct vm_area_struct *vma);
 };
+/**
+ * struct vb2_plane - plane information
+ * @mem_priv:   private data with this plane
+ * @dbuf:       dma_buf - shared buffer object
+ * @dbuf_mapped:        flag to show whether dbuf is mapped or not
+ * @bytesused:  number of bytes occupied by data in the plane (payload)
+ * @length:     size of this plane (NOT the payload) in bytes
+ * @mem_offset: when memory in the associated struct vb2_buffer is
+ *              VB2_MEMORY_MMAP, equals the offset from the start of
+ *              the device memory for this plane (or is a "cookie" that
+ *              should be passed to mmap() called on the video node)
+ * @userptr:    when memory is VB2_MEMORY_USERPTR, a userspace pointer
+ *              pointing to this plane
+ * @fd:         when memory is VB2_MEMORY_DMABUF, a userspace file
+ *              descriptor associated with this plane
+ * @data_offset:        offset in the plane to the start of data; usually 0,
+ *              unless there is a header in front of the data
+ * Should contain enough information to be able to cover all the fields
+ * of struct v4l2_plane at videodev2.h
+ */
 struct vb2_plane {
        void                    *mem_priv;
        struct dma_buf          *dbuf;
        unsigned int            dbuf_mapped;
+        unsigned int            bytesused;
+        unsigned int            length;
+        union {
+                unsigned int    offset;
+                unsigned long   userptr;
+                int             fd;
+        } m;
+        unsigned int            data_offset;
 };
 /**
@@ -163,43 +191,32 @@ struct vb2_queue;
 /**
 * struct vb2_buffer - represents a video buffer
- * @v4l2_buf:           struct v4l2_buffer associated with this buffer; can
- *                      be read by the driver and relevant entries can be
- *                      changed by the driver in case of CAPTURE types
- *                      (such as timestamp)
- * @v4l2_planes:        struct v4l2_planes associated with this buffer; can
- *                      be read by the driver and relevant entries can be
- *                      changed by the driver in case of CAPTURE types
- *                      (such as bytesused); NOTE that even for single-planar
- *                      types, the v4l2_planes[0] struct should be used
- *                      instead of v4l2_buf for filling bytesused - drivers
- *                      should use the vb2_set_plane_payload() function for that
 * @vb2_queue:          the queue to which this driver belongs
+ * @index:              id number of the buffer
+ * @type:               buffer type
+ * @memory:             the method, in which the actual data is passed
 * @num_planes:         number of planes in the buffer
 *                      on an internal driver queue
+ * @planes:             private per-plane information; do not change
 * @state:              current buffer state; do not change
 * @queued_entry:       entry on the queued buffers list, which holds all
 *                      buffers queued from userspace
 * @done_entry:         entry on the list that stores all buffers ready to
 *                      be dequeued to userspace
- * @planes:             private per-plane information; do not change
 */
 struct vb2_buffer {
-        struct v4l2_buffer      v4l2_buf;
-        struct v4l2_plane       v4l2_planes[VIDEO_MAX_PLANES];
        struct vb2_queue        *vb2_queue;
+        unsigned int            index;
+        unsigned int            type;
+        unsigned int            memory;
        unsigned int            num_planes;
+        struct vb2_plane        planes[VIDEO_MAX_PLANES];
-/* Private: internal use only */
+        /* Private: internal use only */
        enum vb2_buffer_state   state;
        struct list_head        queued_entry;
        struct list_head        done_entry;
-        struct vb2_plane        planes[VIDEO_MAX_PLANES];
 #ifdef CONFIG_VIDEO_ADV_DEBUG
        /*
         * Counters for how often these buffer-related ops are
@@ -354,7 +371,8 @@ struct v4l2_fh;
 * @drv_priv:   driver private data
 * @buf_struct_size: size of the driver-specific buffer structure;
 *              "0" indicates the driver doesn't want to use a custom buffer
- *              structure type, so sizeof(struct vb2_buffer) will is used
+ *              structure type. for example, sizeof(struct vb2_v4l2_buffer)
+ *              will be used for v4l2.
 * @timestamp_flags: Timestamp flags; V4L2_BUF_FLAG_TIMESTAMP_* and
 *              V4L2_BUF_FLAG_TSTAMP_SRC_*
 * @gfp_flags:  additional gfp flags used when allocating the buffers.
@@ -573,7 +591,7 @@ static inline void vb2_set_plane_payload(struct vb2_buffer *vb,
                                 unsigned int plane_no, unsigned long size)
 {
        if (plane_no < vb->num_planes)
-                vb->v4l2_planes[plane_no].bytesused = size;
+                vb->planes[plane_no].bytesused = size;
 }
 /**
@@ -585,7 +603,7 @@ static inline unsigned long vb2_get_plane_payload(struct vb2_buffer *vb,
                                 unsigned int plane_no)
 {
        if (plane_no < vb->num_planes)
-                return vb->v4l2_planes[plane_no].bytesused;
+                return vb->planes[plane_no].bytesused;
        return 0;
 }
@@ -598,7 +616,7 @@ static inline unsigned long
 vb2_plane_size(struct vb2_buffer *vb, unsigned int plane_no)
 {
        if (plane_no < vb->num_planes)
-                return vb->v4l2_planes[plane_no].length;
+                return vb->planes[plane_no].length;
        return 0;
 }
diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
index d4a4d9acd39b..20d8ad20066c 100644
--- a/include/media/videobuf2-v4l2.h
+++ b/include/media/videobuf2-v4l2.h
@@ -12,6 +12,34 @@
 #ifndef _MEDIA_VIDEOBUF2_V4L2_H
 #define _MEDIA_VIDEOBUF2_V4L2_H
+#include <linux/videodev2.h>
 #include <media/videobuf2-core.h>
+/**
+ * struct vb2_v4l2_buffer - video buffer information for v4l2
+ * @vb2_buf:    video buffer 2
+ * @flags:      buffer informational flags
+ * @field:      enum v4l2_field; field order of the image in the buffer
+ * @timestamp:  frame timestamp
+ * @timecode:   frame timecode
+ * @sequence:   sequence count of this frame
+ * Should contain enough information to be able to cover all the fields
+ * of struct v4l2_buffer at videodev2.h
+ */
+struct vb2_v4l2_buffer {
+        struct vb2_buffer       vb2_buf;
+        __u32                   flags;
+        __u32                   field;
+        struct timeval          timestamp;
+        struct v4l2_timecode    timecode;
+        __u32                   sequence;
+};
+/**
+ * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
+ */
+#define to_vb2_v4l2_buffer(vb) \
+        (container_of(vb, struct vb2_v4l2_buffer, vb2_buf))
 #endif /* _MEDIA_VIDEOBUF2_V4L2_H */
diff --git a/include/trace/events/v4l2.h b/include/trace/events/v4l2.h
index dbf017bfddd9..b015b38a4dda 100644
--- a/include/trace/events/v4l2.h
+++ b/include/trace/events/v4l2.h
@@ -202,27 +202,28 @@ DECLARE_EVENT_CLASS(vb2_event_class,
        ),
        TP_fast_assign(
+                struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
                __entry->minor = q->owner ? q->owner->vdev->minor : -1;
                __entry->queued_count = q->queued_count;
                __entry->owned_by_drv_count =
                        atomic_read(&q->owned_by_drv_count);
-                __entry->index = vb->v4l2_buf.index;
+                __entry->index = vb->index;
-                __entry->type = vb->v4l2_buf.type;
+                __entry->type = vb->type;
-                __entry->bytesused = vb->v4l2_planes[0].bytesused;
+                __entry->bytesused = vb->planes[0].bytesused;
-                __entry->flags = vb->v4l2_buf.flags;
+                __entry->flags = vbuf->flags;
-                __entry->field = vb->v4l2_buf.field;
+                __entry->field = vbuf->field;
-                __entry->timestamp = timeval_to_ns(&vb->v4l2_buf.timestamp);
+                __entry->timestamp = timeval_to_ns(&vbuf->timestamp);
-                __entry->timecode_type = vb->v4l2_buf.timecode.type;
+                __entry->timecode_type = vbuf->timecode.type;
-                __entry->timecode_flags = vb->v4l2_buf.timecode.flags;
+                __entry->timecode_flags = vbuf->timecode.flags;
-                __entry->timecode_frames = vb->v4l2_buf.timecode.frames;
+                __entry->timecode_frames = vbuf->timecode.frames;
-                __entry->timecode_seconds = vb->v4l2_buf.timecode.seconds;
+                __entry->timecode_seconds = vbuf->timecode.seconds;
-                __entry->timecode_minutes = vb->v4l2_buf.timecode.minutes;
+                __entry->timecode_minutes = vbuf->timecode.minutes;
-                __entry->timecode_hours = vb->v4l2_buf.timecode.hours;
+                __entry->timecode_hours = vbuf->timecode.hours;
-                __entry->timecode_userbits0 = vb->v4l2_buf.timecode.userbits[0];
+                __entry->timecode_userbits0 = vbuf->timecode.userbits[0];
-                __entry->timecode_userbits1 = vb->v4l2_buf.timecode.userbits[1];
+                __entry->timecode_userbits1 = vbuf->timecode.userbits[1];
-                __entry->timecode_userbits2 = vb->v4l2_buf.timecode.userbits[2];
+                __entry->timecode_userbits2 = vbuf->timecode.userbits[2];
-                __entry->timecode_userbits3 = vb->v4l2_buf.timecode.userbits[3];
+                __entry->timecode_userbits3 = vbuf->timecode.userbits[3];
-                __entry->sequence = vb->v4l2_buf.sequence;
+                __entry->sequence = vbuf->sequence;
        ),
        TP_printk("minor = %d, queued = %u, owned_by_drv = %d, index = %u, "
author	Junghak Sung <jh1009.sung@samsung.com>	2015-09-22 09:30:30 -0400
committer	Mauro Carvalho Chehab <mchehab@osg.samsung.com>	2015-10-01 08:04:43 -0400
commit	2d7007153f0c9b1dd00c01894df7d26ddc32b79f (patch)
tree	8320f9d22f45dd7dcea64088b50ff706bb0082b2
parent	c139990e842d550db2f59bd4f5993bba90f140e0 (diff)