8 files changed, 56 insertions, 40 deletions

diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
index 3170b8f72c68..f9d87b86492c 100644
--- a/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@ -303,7 +303,7 @@ static int dsp_buffer_free(snd_cx88_card_t *chip)
         BUG_ON(!chip->dma_size);
 
         dprintk(2,"Freeing buffer\n");
-        videobuf_dma_pci_unmap(chip->pci, &chip->dma_risc);
+        videobuf_pci_dma_unmap(chip->pci, &chip->dma_risc);
         videobuf_dma_free(&chip->dma_risc);
         btcx_riscmem_free(chip->pci,&chip->buf->risc);
         kfree(chip->buf);
@@ -429,7 +429,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         videobuf_dma_init_kernel(&buf->vb.dma,PCI_DMA_FROMDEVICE,
                         (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT));
 
-        videobuf_dma_pci_map(chip->pci,&buf->vb.dma);
+        videobuf_pci_dma_map(chip->pci,&buf->vb.dma);
 
 
         cx88_risc_databuffer(chip->pci, &buf->risc,
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index a502a4d6e4ae..e100d8ef369a 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1341,7 +1341,7 @@ bb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                enum v4l2_field field)
 {
         struct cx8802_fh *fh = q->priv_data;
-        return cx8802_buf_prepare(fh->dev, (struct cx88_buffer*)vb, field);
+        return cx8802_buf_prepare(q, fh->dev, (struct cx88_buffer*)vb, field);
 }
 
 static void
@@ -1354,8 +1354,7 @@ bb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 static void
 bb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct cx8802_fh *fh = q->priv_data;
-        cx88_free_buffer(fh->dev->pci, (struct cx88_buffer*)vb);
+        cx88_free_buffer(q, (struct cx88_buffer*)vb);
 }
 
 static struct videobuf_queue_ops blackbird_qops = {
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index c2cdbafdb77b..2c3d9f1999be 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -213,13 +213,13 @@ int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
 }
 
 void
-cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf)
+cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
 {
         BUG_ON(in_interrupt());
         videobuf_waiton(&buf->vb,0,0);
-        videobuf_dma_pci_unmap(pci, &buf->vb.dma);
+        videobuf_dma_unmap(q, &buf->vb.dma);
         videobuf_dma_free(&buf->vb.dma);
-        btcx_riscmem_free(pci, &buf->risc);
+        btcx_riscmem_free((struct pci_dev *)q->dev, &buf->risc);
         buf->vb.state = STATE_NEEDS_INIT;
 }
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index a9fc2695b157..f0ea9b5cdbc2 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -90,7 +90,7 @@ static int dvb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                            enum v4l2_field field)
 {
         struct cx8802_dev *dev = q->priv_data;
-        return cx8802_buf_prepare(dev, (struct cx88_buffer*)vb,field);
+        return cx8802_buf_prepare(q, dev, (struct cx88_buffer*)vb,field);
 }
 
 static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
@@ -101,8 +101,7 @@ static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 
 static void dvb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct cx8802_dev *dev = q->priv_data;
-        cx88_free_buffer(dev->pci, (struct cx88_buffer*)vb);
+        cx88_free_buffer(q, (struct cx88_buffer*)vb);
 }
 
 static struct videobuf_queue_ops dvb_qops = {
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index c79cc1d2bf8b..7d16888b4a86 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -163,8 +163,8 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
 
 /* ------------------------------------------------------------------ */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
-                        enum v4l2_field field)
+int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
+                        struct cx88_buffer *buf, enum v4l2_field field)
 {
         int size = dev->ts_packet_size * dev->ts_packet_count;
         int rc;
@@ -179,7 +179,7 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
                 buf->vb.size   = size;
                 buf->vb.field  = field /*V4L2_FIELD_TOP*/;
 
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
                 cx88_risc_databuffer(dev->pci, &buf->risc,
                                      buf->vb.dma.sglist,
@@ -189,36 +189,36 @@ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
 {
         struct cx88_buffer    *prev;
-        struct cx88_dmaqueue  *q    = &dev->mpegq;
+        struct cx88_dmaqueue  *cx88q = &dev->mpegq;
 
         dprintk( 1, "cx8802_buf_queue\n" );
         /* add jump to stopper */
         buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
-        buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+        buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma);
 
-        if (list_empty(&q->active)) {
+        if (list_empty(&cx88q->active)) {
                 dprintk( 0, "queue is empty - first active\n" );
-                list_add_tail(&buf->vb.queue,&q->active);
-                cx8802_start_dma(dev, q, buf);
+                list_add_tail(&buf->vb.queue,&cx88q->active);
+                cx8802_start_dma(dev, cx88q, buf);
                 buf->vb.state = STATE_ACTIVE;
-                buf->count    = q->count++;
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
+                buf->count    = cx88q->count++;
+                mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(0,"[%p/%d] %s - first active\n",
                         buf, buf->vb.i, __FUNCTION__);
 
         } else {
                 dprintk( 1, "queue is not empty - append to active\n" );
-                prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
-                list_add_tail(&buf->vb.queue,&q->active);
+                prev = list_entry(cx88q->active.prev, struct cx88_buffer, vb.queue);
+                list_add_tail(&buf->vb.queue,&cx88q->active);
                 buf->vb.state = STATE_ACTIVE;
-                buf->count    = q->count++;
+                buf->count    = cx88q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk( 1, "[%p/%d] %s - append to active\n",
                         buf, buf->vb.i, __FUNCTION__);
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c
index 9bc6c8995581..846faadc9f1c 100644
--- a/drivers/media/video/cx88/cx88-vbi.c
+++ b/drivers/media/video/cx88/cx88-vbi.c
@@ -175,7 +175,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
                 buf->vb.size   = size;
                 buf->vb.field  = V4L2_FIELD_SEQ_TB;
 
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
                 cx88_risc_buffer(dev->pci, &buf->risc,
                                  buf->vb.dma.sglist,
@@ -187,7 +187,7 @@ vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
@@ -227,9 +227,8 @@ vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 static void vbi_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
-        struct cx8800_fh   *fh  = q->priv_data;
 
-        cx88_free_buffer(fh->dev->pci,buf);
+        cx88_free_buffer(q,buf);
 }
 
 struct videobuf_queue_ops cx8800_vbi_qops = {
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 6c97aa740d27..72a417b31745 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -564,7 +564,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
 
         if (STATE_NEEDS_INIT == buf->vb.state) {
                 init_buffer = 1;
-                if (0 != (rc = videobuf_iolock(dev->pci,&buf->vb,NULL)))
+                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
                         goto fail;
         }
 
@@ -614,7 +614,7 @@ buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
         return 0;
 
  fail:
-        cx88_free_buffer(dev->pci,buf);
+        cx88_free_buffer(q,buf);
         return rc;
 }
 
@@ -671,9 +671,8 @@ buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
         struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
-        struct cx8800_fh   *fh  = q->priv_data;
 
-        cx88_free_buffer(fh->dev->pci,buf);
+        cx88_free_buffer(q,buf);
 }
 
 static struct videobuf_queue_ops cx8800_video_qops = {
@@ -1251,9 +1250,17 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 {
         int err;
 
-        dprintk(2, "CORE IOCTL: 0x%x\n", cmd );
-        if (video_debug > 1)
-                v4l_print_ioctl(core->name,cmd);
+       if (video_debug) {
+               if (video_debug > 1) {
+                       if (_IOC_DIR(cmd) & _IOC_WRITE)
+                               v4l_printk_ioctl_arg("cx88(w)",cmd, arg);
+                       else if (!_IOC_DIR(cmd) & _IOC_READ) {
+                               v4l_print_ioctl("cx88", cmd);
+                       }
+               } else
+                       v4l_print_ioctl(core->name,cmd);
+
+       }
 
         switch (cmd) {
         /* ---------- tv norms ---------- */
@@ -1460,7 +1467,19 @@ int cx88_do_ioctl(struct inode *inode, struct file *file, int radio,
 static int video_ioctl(struct inode *inode, struct file *file,
                        unsigned int cmd, unsigned long arg)
 {
-        return video_usercopy(inode, file, cmd, arg, video_do_ioctl);
+       int retval;
+
+       retval=video_usercopy(inode, file, cmd, arg, video_do_ioctl);
+
+       if (video_debug > 1) {
+               if (retval < 0) {
+                       v4l_print_ioctl("cx88(err)", cmd);
+                       printk(KERN_DEBUG "cx88(err): errcode=%d\n",retval);
+               } else if (_IOC_DIR(cmd) & _IOC_READ)
+                       v4l_printk_ioctl_arg("cx88(r)",cmd, (void *)arg);
+       }
+
+       return retval;
 }
 
 /* ----------------------------------------------------------- */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index cfa8668784b4..5b2e499eab22 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -485,7 +485,7 @@ extern int
 cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
                   u32 reg, u32 mask, u32 value);
 extern void
-cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf);
+cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf);
 
 extern void cx88_risc_disasm(struct cx88_core *core,
                              struct btcx_riscmem *risc);
@@ -577,8 +577,8 @@ void cx88_ir_irq(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-mpeg.c                                                 */
 
-int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf,
-                        enum v4l2_field field);
+int cx8802_buf_prepare(struct videobuf_queue *q,struct cx8802_dev *dev,
+                        struct cx88_buffer *buf, enum v4l2_field field);
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf);
 void cx8802_cancel_buffers(struct cx8802_dev *dev);