V4L/DVB (7566): videobuf-dvb: allow its usage with videobuf-vmalloc

videobuf-dvb were still using a function that were videobuf-dma-sg
dependent. This patch creates a generic handler for this function. This
way, videobuf-dvb can now work with all videobuf implementations.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c
index 0f8542a4c71a..6e4d73ec6855 100644
--- a/drivers/media/video/videobuf-dvb.c
+++ b/drivers/media/video/videobuf-dvb.c
@@ -20,9 +20,10 @@
 #include <linux/fs.h>
 #include <linux/kthread.h>
 #include <linux/file.h>
+
 #include <linux/freezer.h>
 
-#include <media/videobuf-dma-sg.h>
+#include <media/videobuf-core.h>
 #include <media/videobuf-dvb.h>
 
 /* ------------------------------------------------------------------ */
@@ -45,7 +46,7 @@ static int videobuf_dvb_thread(void *data)
         struct videobuf_buffer *buf;
         unsigned long flags;
         int err;
-        struct videobuf_dmabuf *dma;
+        void *outp;
 
         dprintk("dvb thread started\n");
         set_freezable();
@@ -66,9 +67,10 @@ static int videobuf_dvb_thread(void *data)
                 try_to_freeze();
 
                 /* feed buffer data to demux */
-                dma=videobuf_to_dma(buf);
+                outp = videobuf_queue_to_vmalloc (&dvb->dvbq, buf);
+
                 if (buf->state == VIDEOBUF_DONE)
-                        dvb_dmx_swfilter(&dvb->demux, dma->vmalloc,
+                        dvb_dmx_swfilter(&dvb->demux, outp,
                                          buf->size);
 
                 /* requeue buffer */