[media] media: videobuf2: Restructure vb2_buffer

[sfrench/cifs-2.6.git] / drivers / media / pci / saa7134 / saa7134-core.c

diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 72d7f992375ec225eca6a31dc2b36a93716871ee..87f39f97a79f21ab8dc016754cc8a19d0d2677de 100644 (file)
--- 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);
-       q->curr->vb2.v4l2_buf.sequence = q->seq_nr++;
-       vb2_buffer_done(&q->curr->vb2, state);
+       v4l2_get_timestamp(&q->curr->vb2.timestamp);
+       q->curr->vb2.sequence = q->seq_nr++;
+       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;
                }