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>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index d2af82dc8faf..9631ead297ee 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -22,7 +22,7 @@
 #include <linux/file.h>
 #include <linux/freezer.h>
 
-#include <media/video-buf.h>
+#include <media/videobuf-dma-sg.h>
 #include <media/video-buf-dvb.h>
 
 /* ------------------------------------------------------------------ */
@@ -45,6 +45,7 @@ static int videobuf_dvb_thread(void *data)
         struct videobuf_buffer *buf;
         unsigned long flags;
         int err;
+        struct videobuf_dmabuf *dma;
 
         dprintk("dvb thread started\n");
         set_freezable();
@@ -65,8 +66,9 @@ static int videobuf_dvb_thread(void *data)
                 try_to_freeze();
 
                 /* feed buffer data to demux */
+                dma=videobuf_to_dma(buf);
                 if (buf->state == STATE_DONE)
-                        dvb_dmx_swfilter(&dvb->demux, buf->dma.vmalloc,
+                        dvb_dmx_swfilter(&dvb->demux, dma->vmalloc,
                                          buf->size);
 
                 /* requeue buffer */