V4L/DVB (6252): Adapt drivers to use the newer videobuf modules

PCI-dependent videobuf_foo methods were renamed as videobuf_pci_foo.

Also, videobuf_dmabuf is now part of videobuf-dma-sg private struct.
So, to access it, a subroutine call is needed.

This patch renames all occurences of those function calls to be
consistent with the video-buf split.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981
Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>

5 files changed, 34 insertions, 27 deletions

diff --git a/drivers/media/video/bt8xx/Kconfig b/drivers/media/video/bt8xx/Kconfig
index 58eae887a629..2ca162b390a2 100644
--- a/drivers/media/video/bt8xx/Kconfig
+++ b/drivers/media/video/bt8xx/Kconfig
@@ -4,7 +4,7 @@ config VIDEO_BT848
         select I2C_ALGOBIT
         select FW_LOADER
         select VIDEO_BTCX
-        select VIDEO_BUF
+        select VIDEOBUF_DMA_SG
         select VIDEO_IR
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 0711c9507843..4ab4e14b5c64 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -2582,7 +2582,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
         if (check_btres(fh, RESOURCE_OVERLAY)) {
                 struct bttv_buffer *new;
 
-                new = videobuf_alloc(sizeof(*new));
+                new = videobuf_pci_alloc(sizeof(*new));
                 new->crop = btv->crop[!!fh->do_crop].rect;
                 bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                 retval = bttv_switch_overlay(btv,fh,new);
@@ -3048,7 +3048,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                 mutex_lock(&fh->cap.lock);
                 if (*on) {
                         fh->ov.tvnorm = btv->tvnorm;
-                        new = videobuf_alloc(sizeof(*new));
+                        new = videobuf_pci_alloc(sizeof(*new));
                         new->crop = btv->crop[!!fh->do_crop].rect;
                         bttv_overlay_risc(btv, &fh->ov, fh->ovfmt, new);
                 } else {
@@ -3141,9 +3141,12 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         retval = -EIO;
                         /* fall through */
                 case STATE_DONE:
-                        videobuf_dma_sync(&fh->cap,&buf->vb.dma);
+                {
+                        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
+                        videobuf_dma_sync(&fh->cap,dma);
                         bttv_dma_free(&fh->cap,btv,buf);
                         break;
+                }
                 default:
                         retval = -EINVAL;
                         break;
@@ -3337,7 +3340,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         if (check_btres(fh, RESOURCE_OVERLAY)) {
                                 struct bttv_buffer *new;
 
-                                new = videobuf_alloc(sizeof(*new));
+                                new = videobuf_pci_alloc(sizeof(*new));
                                 new->crop = btv->crop[!!fh->do_crop].rect;
                                 bttv_overlay_risc(btv,&fh->ov,fh->ovfmt,new);
                                 retval = bttv_switch_overlay(btv,fh,new);
@@ -3696,7 +3699,7 @@ static unsigned int bttv_poll(struct file *file, poll_table *wait)
                                 mutex_unlock(&fh->cap.lock);
                                 return POLLERR;
                         }
-                        fh->cap.read_buf = videobuf_alloc(fh->cap.msize);
+                        fh->cap.read_buf = videobuf_pci_alloc(fh->cap.msize);
                         if (NULL == fh->cap.read_buf) {
                                 mutex_unlock(&fh->cap.lock);
                                 return POLLERR;
@@ -3763,13 +3766,13 @@ static int bttv_open(struct inode *inode, struct file *file)
         fh->ov.setup_ok = 0;
         v4l2_prio_open(&btv->prio,&fh->prio);
 
-        videobuf_queue_init(&fh->cap, &bttv_video_qops,
+        videobuf_queue_pci_init(&fh->cap, &bttv_video_qops,
                             btv->c.pci, &btv->s_lock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct bttv_buffer),
                             fh);
-        videobuf_queue_init(&fh->vbi, &bttv_vbi_qops,
+        videobuf_queue_pci_init(&fh->vbi, &bttv_vbi_qops,
                             btv->c.pci, &btv->s_lock,
                             V4L2_BUF_TYPE_VBI_CAPTURE,
                             V4L2_FIELD_SEQ_TB,
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c
index e7104d9cb4bd..58986f1a5f1a 100644
--- a/drivers/media/video/bt8xx/bttv-risc.c
+++ b/drivers/media/video/bt8xx/bttv-risc.c
@@ -574,10 +574,12 @@ bttv_risc_hook(struct bttv *btv, int slot, struct btcx_riscmem *risc,
 void
 bttv_dma_free(struct videobuf_queue *q,struct bttv *btv, struct bttv_buffer *buf)
 {
+        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
+
         BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_unmap(q, &buf->vb.dma);
-        videobuf_dma_free(&buf->vb.dma);
+        videobuf_dma_unmap(q, dma);
+        videobuf_dma_free(dma);
         btcx_riscmem_free(btv->c.pci,&buf->bottom);
         btcx_riscmem_free(btv->c.pci,&buf->top);
         buf->vb.state = STATE_NEEDS_INIT;
@@ -699,6 +701,7 @@ int
 bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
 {
         const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;
+        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
         dprintk(KERN_DEBUG
                 "bttv%d: buffer field: %s  format: %s  size: %dx%d\n",
@@ -716,25 +719,25 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
 
                 switch (buf->vb.field) {
                 case V4L2_FIELD_TOP:
-                        bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->top,dma->sglist,
                                          /* offset */ 0,bpl,
                                          /* padding */ 0,/* skip_lines */ 0,
                                          buf->vb.height);
                         break;
                 case V4L2_FIELD_BOTTOM:
-                        bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->bottom,dma->sglist,
                                          0,bpl,0,0,buf->vb.height);
                         break;
                 case V4L2_FIELD_INTERLACED:
-                        bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->top,dma->sglist,
                                          0,bpl,bpl,0,buf->vb.height >> 1);
-                        bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->bottom,dma->sglist,
                                          bpl,bpl,bpl,0,buf->vb.height >> 1);
                         break;
                 case V4L2_FIELD_SEQ_TB:
-                        bttv_risc_packed(btv,&buf->top,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->top,dma->sglist,
                                          0,bpl,0,0,buf->vb.height >> 1);
-                        bttv_risc_packed(btv,&buf->bottom,buf->vb.dma.sglist,
+                        bttv_risc_packed(btv,&buf->bottom,dma->sglist,
                                          bpf,bpl,0,0,buf->vb.height >> 1);
                         break;
                 default:
@@ -767,7 +770,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
                                       buf->vb.height,/* both_fields */ 0,
                                       tvnorm,&buf->crop);
-                        bttv_risc_planar(btv, &buf->top, buf->vb.dma.sglist,
+                        bttv_risc_planar(btv, &buf->top, dma->sglist,
                                          0,buf->vb.width,0,buf->vb.height,
                                          uoffset,voffset,buf->fmt->hshift,
                                          buf->fmt->vshift,0);
@@ -776,7 +779,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         bttv_calc_geo(btv,&buf->geo,buf->vb.width,
                                       buf->vb.height,0,
                                       tvnorm,&buf->crop);
-                        bttv_risc_planar(btv, &buf->bottom, buf->vb.dma.sglist,
+                        bttv_risc_planar(btv, &buf->bottom, dma->sglist,
                                          0,buf->vb.width,0,buf->vb.height,
                                          uoffset,voffset,buf->fmt->hshift,
                                          buf->fmt->vshift,0);
@@ -789,14 +792,14 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         ypadding = buf->vb.width;
                         cpadding = buf->vb.width >> buf->fmt->hshift;
                         bttv_risc_planar(btv,&buf->top,
-                                         buf->vb.dma.sglist,
+                                         dma->sglist,
                                          0,buf->vb.width,ypadding,lines,
                                          uoffset,voffset,
                                          buf->fmt->hshift,
                                          buf->fmt->vshift,
                                          cpadding);
                         bttv_risc_planar(btv,&buf->bottom,
-                                         buf->vb.dma.sglist,
+                                         dma->sglist,
                                          ypadding,buf->vb.width,ypadding,lines,
                                          uoffset+cpadding,
                                          voffset+cpadding,
@@ -812,7 +815,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                         ypadding = buf->vb.width;
                         cpadding = buf->vb.width >> buf->fmt->hshift;
                         bttv_risc_planar(btv,&buf->top,
-                                         buf->vb.dma.sglist,
+                                         dma->sglist,
                                          0,buf->vb.width,0,lines,
                                          uoffset >> 1,
                                          voffset >> 1,
@@ -820,7 +823,7 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                                          buf->fmt->vshift,
                                          0);
                         bttv_risc_planar(btv,&buf->bottom,
-                                         buf->vb.dma.sglist,
+                                         dma->sglist,
                                          lines * ypadding,buf->vb.width,0,lines,
                                          lines * ypadding + (uoffset >> 1),
                                          lines * ypadding + (voffset >> 1),
@@ -839,10 +842,10 @@ bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
                 buf->vb.field = V4L2_FIELD_SEQ_TB;
                 bttv_calc_geo(btv,&buf->geo,tvnorm->swidth,tvnorm->sheight,
                               1,tvnorm,&buf->crop);
-                bttv_risc_packed(btv, &buf->top,  buf->vb.dma.sglist,
+                bttv_risc_packed(btv, &buf->top,  dma->sglist,
                                  /* offset */ 0, RAW_BPL, /* padding */ 0,
                                  /* skip_lines */ 0, RAW_LINES);
-                bttv_risc_packed(btv, &buf->bottom, buf->vb.dma.sglist,
+                bttv_risc_packed(btv, &buf->bottom, dma->sglist,
                                  buf->vb.size/2 , RAW_BPL, 0, 0, RAW_LINES);
         }
 
diff --git a/drivers/media/video/bt8xx/bttv-vbi.c b/drivers/media/video/bt8xx/bttv-vbi.c
index 007485aa4f01..346ce019bdcb 100644
--- a/drivers/media/video/bt8xx/bttv-vbi.c
+++ b/drivers/media/video/bt8xx/bttv-vbi.c
@@ -150,13 +150,14 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
 
         if (redo_dma_risc) {
                 unsigned int bpl, padding, offset;
+                struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
                 bpl = 2044; /* max. vbipack */
                 padding = VBI_BPL - bpl;
 
                 if (fh->vbi_fmt.fmt.count[0] > 0) {
                         rc = bttv_risc_packed(btv, &buf->top,
-                                              buf->vb.dma.sglist,
+                                              dma->sglist,
                                               /* offset */ 0, bpl,
                                               padding, skip_lines0,
                                               fh->vbi_fmt.fmt.count[0]);
@@ -168,7 +169,7 @@ static int vbi_buffer_prepare(struct videobuf_queue *q,
                         offset = fh->vbi_fmt.fmt.count[0] * VBI_BPL;
 
                         rc = bttv_risc_packed(btv, &buf->bottom,
-                                              buf->vb.dma.sglist,
+                                              dma->sglist,
                                               offset, bpl,
                                               padding, skip_lines1,
                                               fh->vbi_fmt.fmt.count[1]);
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h
index 5b25faca1504..0b92c35a8435 100644
--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@@ -41,7 +41,7 @@
 #include <media/v4l2-common.h>
 
 #include <linux/device.h>
-#include <media/video-buf.h>
+#include <media/videobuf-dma-sg.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/ir-common.h>