linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git] / drivers / media / video / video-buf.c
index c7c7465..9ef4775 100644 (file)
@@ -1,4 +1,5 @@
 /*
+ *
  * generic helper functions for video4linux capture buffers, to handle
  * memory management and PCI DMA.  Right now bttv + saa7134 use it.
  *
@@ -7,7 +8,7 @@
  * into PAGE_SIZE chunks).  They also assume the driver does not need
  * to touch the video data (thus it is probably not useful for USB 1.1
  * as data often must be uncompressed by the drivers).
- * 
+ *
  * (c) 2001-2004 Gerd Knorr <kraxel@bytesex.org> [SUSE Labs]
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,6 +19,7 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/vmalloc.h>
 #include <linux/pagemap.h>
 #include <linux/slab.h>
        { printk(KERN_ERR "magic mismatch: %x (expected %x)\n",is,should); BUG(); }
 
 static int debug = 0;
+module_param(debug, int, 0644);
 
 MODULE_DESCRIPTION("helper module to manage video4linux pci dma buffers");
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
-MODULE_PARM(debug,"i");
 
 #define dprintk(level, fmt, arg...)    if (debug >= level) \
        printk(KERN_DEBUG "vbuf: " fmt , ## arg)
@@ -50,10 +52,9 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
        struct page *pg;
        int i;
 
-       sglist = kmalloc(sizeof(struct scatterlist)*nr_pages, GFP_KERNEL);
+       sglist = kcalloc(nr_pages, sizeof(struct scatterlist), GFP_KERNEL);
        if (NULL == sglist)
                return NULL;
-       memset(sglist,0,sizeof(struct scatterlist)*nr_pages);
        for (i = 0; i < nr_pages; i++, virt += PAGE_SIZE) {
                pg = vmalloc_to_page(virt);
                if (NULL == pg)
@@ -64,7 +65,7 @@ videobuf_vmalloc_to_sg(unsigned char *virt, int nr_pages)
                sglist[i].length = PAGE_SIZE;
        }
        return sglist;
-       
+
  err:
        kfree(sglist);
        return NULL;
@@ -78,10 +79,9 @@ videobuf_pages_to_sg(struct page **pages, int nr_pages, int offset)
 
        if (NULL == pages[0])
                return NULL;
-       sglist = kmalloc(sizeof(*sglist) * nr_pages, GFP_KERNEL);
+       sglist = kcalloc(nr_pages, sizeof(*sglist), GFP_KERNEL);
        if (NULL == sglist)
                return NULL;
-       memset(sglist, 0, sizeof(*sglist) * nr_pages);
 
        if (NULL == pages[0])
                goto nopage;
@@ -145,7 +145,7 @@ int videobuf_dma_init_user(struct videobuf_dmabuf *dma, int direction,
                data,size,dma->nr_pages);
 
        down_read(&current->mm->mmap_sem);
-        err = get_user_pages(current,current->mm,
+       err = get_user_pages(current,current->mm,
                             data & PAGE_MASK, dma->nr_pages,
                             rw == READ, 1, /* force */
                             dma->pages, NULL);
@@ -191,7 +191,7 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
 {
        MAGIC_CHECK(dma->magic,MAGIC_DMABUF);
        BUG_ON(0 == dma->nr_pages);
-       
+
        if (dma->pages) {
                dma->sglist = videobuf_pages_to_sg(dma->pages, dma->nr_pages,
                                                   dma->offset);
@@ -214,9 +214,18 @@ int videobuf_dma_pci_map(struct pci_dev *dev, struct videobuf_dmabuf *dma)
                return -ENOMEM;
        }
 
-       if (!dma->bus_addr)
+       if (!dma->bus_addr) {
                dma->sglen = pci_map_sg(dev,dma->sglist,dma->nr_pages,
                                        dma->direction);
+               if (0 == dma->sglen) {
+                       printk(KERN_WARNING
+                              "%s: pci_map_sg failed\n",__FUNCTION__);
+                       kfree(dma->sglist);
+                       dma->sglist = NULL;
+                       dma->sglen = 0;
+                       return -EIO;
+               }
+       }
        return 0;
 }
 
@@ -256,10 +265,10 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma)
                kfree(dma->pages);
                dma->pages = NULL;
        }
-       if (dma->vmalloc) {
-               vfree(dma->vmalloc);
-               dma->vmalloc = NULL;
-       }
+
+       vfree(dma->vmalloc);
+       dma->vmalloc = NULL;
+
        if (dma->bus_addr) {
                dma->bus_addr = 0;
        }
@@ -273,9 +282,8 @@ void* videobuf_alloc(unsigned int size)
 {
        struct videobuf_buffer *vb;
 
-       vb = kmalloc(size,GFP_KERNEL);
+       vb = kzalloc(size,GFP_KERNEL);
        if (NULL != vb) {
-               memset(vb,0,size);
                videobuf_dma_init(&vb->dma);
                init_waitqueue_head(&vb->done);
                vb->magic     = MAGIC_BUFFER;
@@ -287,7 +295,7 @@ int videobuf_waiton(struct videobuf_buffer *vb, int non_blocking, int intr)
 {
        int retval = 0;
        DECLARE_WAITQUEUE(wait, current);
-       
+
        MAGIC_CHECK(vb->magic,MAGIC_BUFFER);
        add_wait_queue(&vb->done, &wait);
        while (vb->state == STATE_ACTIVE || vb->state == STATE_QUEUED) {
@@ -353,39 +361,39 @@ videobuf_iolock(struct pci_dev *pci, struct videobuf_buffer *vb,
        err = videobuf_dma_pci_map(pci,&vb->dma);
        if (0 != err)
                return err;
-               
+
        return 0;
 }
 
 /* --------------------------------------------------------------------- */
 
-void
-videobuf_queue_init(struct videobuf_queue *q,
-                   struct videobuf_queue_ops *ops,
-                   struct pci_dev *pci,
-                   spinlock_t *irqlock,
-                   enum v4l2_buf_type type,
-                   enum v4l2_field field,
-                   unsigned int msize)
+void videobuf_queue_init(struct videobuf_queue* q,
+                        struct videobuf_queue_ops *ops,
+                        struct pci_dev *pci,
+                        spinlock_t *irqlock,
+                        enum v4l2_buf_type type,
+                        enum v4l2_field field,
+                        unsigned int msize,
+                        void *priv)
 {
        memset(q,0,sizeof(*q));
-
        q->irqlock = irqlock;
        q->pci     = pci;
        q->type    = type;
        q->field   = field;
        q->msize   = msize;
        q->ops     = ops;
+       q->priv_data = priv;
 
        init_MUTEX(&q->lock);
        INIT_LIST_HEAD(&q->stream);
 }
 
-int 
+int
 videobuf_queue_is_busy(struct videobuf_queue *q)
 {
        int i;
-       
+
        if (q->streaming) {
                dprintk(1,"busy: streaming active\n");
                return 1;
@@ -418,7 +426,7 @@ videobuf_queue_is_busy(struct videobuf_queue *q)
 }
 
 void
-videobuf_queue_cancel(struct file *file, struct videobuf_queue *q)
+videobuf_queue_cancel(struct videobuf_queue *q)
 {
        unsigned long flags;
        int i;
@@ -439,7 +447,7 @@ videobuf_queue_cancel(struct file *file, struct videobuf_queue *q)
        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                if (NULL == q->bufs[i])
                        continue;
-               q->ops->buf_release(file,q->bufs[i]);
+               q->ops->buf_release(q,q->bufs[i]);
        }
        INIT_LIST_HEAD(&q->stream);
 }
@@ -521,7 +529,7 @@ videobuf_status(struct v4l2_buffer *b, struct videobuf_buffer *vb,
 }
 
 int
-videobuf_reqbufs(struct file *file, struct videobuf_queue *q,
+videobuf_reqbufs(struct videobuf_queue *q,
                 struct v4l2_requestbuffers *req)
 {
        unsigned int size,count;
@@ -546,12 +554,12 @@ videobuf_reqbufs(struct file *file, struct videobuf_queue *q,
        if (count > VIDEO_MAX_FRAME)
                count = VIDEO_MAX_FRAME;
        size = 0;
-       q->ops->buf_setup(file,&count,&size);
+       q->ops->buf_setup(q,&count,&size);
        size = PAGE_ALIGN(size);
        dprintk(1,"reqbufs: bufs=%d, size=0x%x [%d pages total]\n",
                count, size, (count*size)>>PAGE_SHIFT);
 
-       retval = videobuf_mmap_setup(file,q,count,size,req->memory);
+       retval = videobuf_mmap_setup(q,count,size,req->memory);
        if (retval < 0)
                goto done;
 
@@ -576,7 +584,7 @@ videobuf_querybuf(struct videobuf_queue *q, struct v4l2_buffer *b)
 }
 
 int
-videobuf_qbuf(struct file *file, struct videobuf_queue *q,
+videobuf_qbuf(struct videobuf_queue *q,
              struct v4l2_buffer *b)
 {
        struct videobuf_buffer *buf;
@@ -620,7 +628,7 @@ videobuf_qbuf(struct file *file, struct videobuf_queue *q,
                if (b->length < buf->bsize)
                        goto done;
                if (STATE_NEEDS_INIT != buf->state && buf->baddr != b->m.userptr)
-                       q->ops->buf_release(file,buf);
+                       q->ops->buf_release(q,buf);
                buf->baddr = b->m.userptr;
                break;
        case V4L2_MEMORY_OVERLAY:
@@ -631,30 +639,30 @@ videobuf_qbuf(struct file *file, struct videobuf_queue *q,
        }
 
        field = videobuf_next_field(q);
-       retval = q->ops->buf_prepare(file,buf,field);
+       retval = q->ops->buf_prepare(q,buf,field);
        if (0 != retval)
                goto done;
-       
+
        list_add_tail(&buf->stream,&q->stream);
        if (q->streaming) {
                spin_lock_irqsave(q->irqlock,flags);
-               q->ops->buf_queue(file,buf);
+               q->ops->buf_queue(q,buf);
                spin_unlock_irqrestore(q->irqlock,flags);
        }
        retval = 0;
-       
+
  done:
        up(&q->lock);
        return retval;
 }
 
 int
-videobuf_dqbuf(struct file *file, struct videobuf_queue *q,
-              struct v4l2_buffer *b)
+videobuf_dqbuf(struct videobuf_queue *q,
+              struct v4l2_buffer *b, int nonblocking)
 {
        struct videobuf_buffer *buf;
        int retval;
-       
+
        down(&q->lock);
        retval = -EBUSY;
        if (q->reading)
@@ -665,7 +673,7 @@ videobuf_dqbuf(struct file *file, struct videobuf_queue *q,
        if (list_empty(&q->stream))
                goto done;
        buf = list_entry(q->stream.next, struct videobuf_buffer, stream);
-       retval = videobuf_waiton(buf, file->f_flags & O_NONBLOCK, 1);
+       retval = videobuf_waiton(buf, nonblocking, 1);
        if (retval < 0)
                goto done;
        switch (buf->state) {
@@ -689,13 +697,13 @@ videobuf_dqbuf(struct file *file, struct videobuf_queue *q,
        return retval;
 }
 
-int videobuf_streamon(struct file *file, struct videobuf_queue *q)
+int videobuf_streamon(struct videobuf_queue *q)
 {
        struct videobuf_buffer *buf;
        struct list_head *list;
        unsigned long flags;
        int retval;
-       
+
        down(&q->lock);
        retval = -EBUSY;
        if (q->reading)
@@ -708,7 +716,7 @@ int videobuf_streamon(struct file *file, struct videobuf_queue *q)
        list_for_each(list,&q->stream) {
                buf = list_entry(list, struct videobuf_buffer, stream);
                if (buf->state == STATE_PREPARED)
-                       q->ops->buf_queue(file,buf);
+                       q->ops->buf_queue(q,buf);
        }
        spin_unlock_irqrestore(q->irqlock,flags);
 
@@ -717,14 +725,14 @@ int videobuf_streamon(struct file *file, struct videobuf_queue *q)
        return retval;
 }
 
-int videobuf_streamoff(struct file *file, struct videobuf_queue *q)
+int videobuf_streamoff(struct videobuf_queue *q)
 {
        int retval = -EINVAL;
 
        down(&q->lock);
        if (!q->streaming)
                goto done;
-       videobuf_queue_cancel(file,q);
+       videobuf_queue_cancel(q);
        q->streaming = 0;
        retval = 0;
 
@@ -734,33 +742,32 @@ int videobuf_streamoff(struct file *file, struct videobuf_queue *q)
 }
 
 static ssize_t
-videobuf_read_zerocopy(struct file *file, struct videobuf_queue *q,
-                      char __user *data, size_t count, loff_t *ppos)
+videobuf_read_zerocopy(struct videobuf_queue *q, char __user *data,
+                      size_t count, loff_t *ppos)
 {
        enum v4l2_field field;
        unsigned long flags;
-        int retval;
+       int retval;
 
-        /* setup stuff */
-       retval = -ENOMEM;
+       /* setup stuff */
        q->read_buf = videobuf_alloc(q->msize);
        if (NULL == q->read_buf)
-               goto done;
+               return -ENOMEM;
 
        q->read_buf->memory = V4L2_MEMORY_USERPTR;
        q->read_buf->baddr  = (unsigned long)data;
-        q->read_buf->bsize  = count;
+       q->read_buf->bsize  = count;
        field = videobuf_next_field(q);
-       retval = q->ops->buf_prepare(file,q->read_buf,field);
+       retval = q->ops->buf_prepare(q,q->read_buf,field);
        if (0 != retval)
                goto done;
-       
-        /* start capture & wait */
+
+       /* start capture & wait */
        spin_lock_irqsave(q->irqlock,flags);
-       q->ops->buf_queue(file,q->read_buf);
+       q->ops->buf_queue(q,q->read_buf);
        spin_unlock_irqrestore(q->irqlock,flags);
-        retval = videobuf_waiton(q->read_buf,0,0);
-        if (0 == retval) {
+       retval = videobuf_waiton(q->read_buf,0,0);
+       if (0 == retval) {
                videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
                if (STATE_ERROR == q->read_buf->state)
                        retval = -EIO;
@@ -770,14 +777,15 @@ videobuf_read_zerocopy(struct file *file, struct videobuf_queue *q,
 
  done:
        /* cleanup */
-       q->ops->buf_release(file,q->read_buf);
+       q->ops->buf_release(q,q->read_buf);
        kfree(q->read_buf);
        q->read_buf = NULL;
        return retval;
 }
 
-ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q,
-                         char __user *data, size_t count, loff_t *ppos)
+ssize_t videobuf_read_one(struct videobuf_queue *q,
+                         char __user *data, size_t count, loff_t *ppos,
+                         int nonblocking)
 {
        enum v4l2_field field;
        unsigned long flags;
@@ -787,11 +795,11 @@ ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q,
        down(&q->lock);
 
        nbufs = 1; size = 0;
-       q->ops->buf_setup(file,&nbufs,&size);
+       q->ops->buf_setup(q,&nbufs,&size);
        if (NULL == q->read_buf  &&
            count >= size        &&
-           !(file->f_flags & O_NONBLOCK)) {
-               retval = videobuf_read_zerocopy(file,q,data,count,ppos);
+           !nonblocking) {
+               retval = videobuf_read_zerocopy(q,data,count,ppos);
                if (retval >= 0  ||  retval == -EIO)
                        /* ok, all done */
                        goto done;
@@ -805,25 +813,29 @@ ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q,
                if (NULL == q->read_buf)
                        goto done;
                q->read_buf->memory = V4L2_MEMORY_USERPTR;
+               q->read_buf->bsize = count; /* preferred size */
                field = videobuf_next_field(q);
-               retval = q->ops->buf_prepare(file,q->read_buf,field);
-               if (0 != retval)
+               retval = q->ops->buf_prepare(q,q->read_buf,field);
+               if (0 != retval) {
+                       kfree (q->read_buf);
+                       q->read_buf = NULL;
                        goto done;
+               }
                spin_lock_irqsave(q->irqlock,flags);
-               q->ops->buf_queue(file,q->read_buf);
+               q->ops->buf_queue(q,q->read_buf);
                spin_unlock_irqrestore(q->irqlock,flags);
                q->read_off = 0;
        }
 
        /* wait until capture is done */
-        retval = videobuf_waiton(q->read_buf, file->f_flags & O_NONBLOCK, 1);
+       retval = videobuf_waiton(q->read_buf, nonblocking, 1);
        if (0 != retval)
                goto done;
        videobuf_dma_pci_sync(q->pci,&q->read_buf->dma);
 
        if (STATE_ERROR == q->read_buf->state) {
                /* catch I/O errors */
-               q->ops->buf_release(file,q->read_buf);
+               q->ops->buf_release(q,q->read_buf);
                kfree(q->read_buf);
                q->read_buf = NULL;
                retval = -EIO;
@@ -842,7 +854,7 @@ ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q,
        q->read_off += bytes;
        if (q->read_off == q->read_buf->size) {
                /* all data copied, cleanup */
-               q->ops->buf_release(file,q->read_buf);
+               q->ops->buf_release(q,q->read_buf);
                kfree(q->read_buf);
                q->read_buf = NULL;
        }
@@ -852,43 +864,44 @@ ssize_t videobuf_read_one(struct file *file, struct videobuf_queue *q,
        return retval;
 }
 
-int videobuf_read_start(struct file *file, struct videobuf_queue *q)
+int videobuf_read_start(struct videobuf_queue *q)
 {
        enum v4l2_field field;
        unsigned long flags;
        int count = 0, size = 0;
        int err, i;
 
-       q->ops->buf_setup(file,&count,&size);
+       q->ops->buf_setup(q,&count,&size);
        if (count < 2)
                count = 2;
        if (count > VIDEO_MAX_FRAME)
                count = VIDEO_MAX_FRAME;
        size = PAGE_ALIGN(size);
 
-       err = videobuf_mmap_setup(file, q, count, size, V4L2_MEMORY_USERPTR);
+       err = videobuf_mmap_setup(q, count, size, V4L2_MEMORY_USERPTR);
        if (err)
                return err;
        for (i = 0; i < count; i++) {
                field = videobuf_next_field(q);
-               err = q->ops->buf_prepare(file,q->bufs[i],field);
+               err = q->ops->buf_prepare(q,q->bufs[i],field);
                if (err)
                        return err;
                list_add_tail(&q->bufs[i]->stream, &q->stream);
        }
        spin_lock_irqsave(q->irqlock,flags);
        for (i = 0; i < count; i++)
-               q->ops->buf_queue(file,q->bufs[i]);
+               q->ops->buf_queue(q,q->bufs[i]);
        spin_unlock_irqrestore(q->irqlock,flags);
        q->reading = 1;
        return 0;
 }
 
-void videobuf_read_stop(struct file *file, struct videobuf_queue *q)
+void videobuf_read_stop(struct videobuf_queue *q)
 {
        int i;
-       
-       videobuf_queue_cancel(file,q);
+
+       videobuf_queue_cancel(q);
+       videobuf_mmap_free(q);
        INIT_LIST_HEAD(&q->stream);
        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                if (NULL == q->bufs[i])
@@ -900,20 +913,21 @@ void videobuf_read_stop(struct file *file, struct videobuf_queue *q)
        q->reading  = 0;
 }
 
-ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q,
+ssize_t videobuf_read_stream(struct videobuf_queue *q,
                             char __user *data, size_t count, loff_t *ppos,
-                            int vbihack)
+                            int vbihack, int nonblocking)
 {
        unsigned int *fc, bytes;
        int err, retval;
        unsigned long flags;
-       
+
+       dprintk(2,"%s\n",__FUNCTION__);
        down(&q->lock);
        retval = -EBUSY;
        if (q->streaming)
                goto done;
        if (!q->reading) {
-               retval = videobuf_read_start(file,q);
+               retval = videobuf_read_start(q);
                if (retval < 0)
                        goto done;
        }
@@ -928,8 +942,7 @@ ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q,
                        list_del(&q->read_buf->stream);
                        q->read_off = 0;
                }
-               err = videobuf_waiton(q->read_buf,
-                                     file->f_flags & O_NONBLOCK,1);
+               err = videobuf_waiton(q->read_buf, nonblocking, 1);
                if (err < 0) {
                        if (0 == retval)
                                retval = err;
@@ -947,7 +960,7 @@ ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q,
                                *fc = q->read_buf->field_count >> 1;
                                dprintk(1,"vbihack: %d\n",*fc);
                        }
-                       
+
                        /* copy stuff */
                        bytes = count;
                        if (bytes > q->read_buf->size - q->read_off)
@@ -974,7 +987,7 @@ ssize_t videobuf_read_stream(struct file *file, struct videobuf_queue *q,
                        list_add_tail(&q->read_buf->stream,
                                      &q->stream);
                        spin_lock_irqsave(q->irqlock,flags);
-                       q->ops->buf_queue(file,q->read_buf);
+                       q->ops->buf_queue(q,q->read_buf);
                        spin_unlock_irqrestore(q->irqlock,flags);
                        q->read_buf = NULL;
                }
@@ -1001,7 +1014,7 @@ unsigned int videobuf_poll_stream(struct file *file,
                                         struct videobuf_buffer, stream);
        } else {
                if (!q->reading)
-                       videobuf_read_start(file,q);
+                       videobuf_read_start(q);
                if (!q->reading) {
                        rc = POLLERR;
                } else if (NULL == q->read_buf) {
@@ -1042,29 +1055,30 @@ static void
 videobuf_vm_close(struct vm_area_struct *vma)
 {
        struct videobuf_mapping *map = vma->vm_private_data;
+       struct videobuf_queue *q = map->q;
        int i;
 
        dprintk(2,"vm_close %p [count=%d,vma=%08lx-%08lx]\n",map,
                map->count,vma->vm_start,vma->vm_end);
 
-       /* down(&fh->lock); FIXME */
        map->count--;
        if (0 == map->count) {
-               dprintk(1,"munmap %p\n",map);
+               dprintk(1,"munmap %p q=%p\n",map,q);
+               down(&q->lock);
                for (i = 0; i < VIDEO_MAX_FRAME; i++) {
-                       if (NULL == map->q->bufs[i])
+                       if (NULL == q->bufs[i])
                                continue;
-                       if (map->q->bufs[i])
+                       if (q->bufs[i])
                                ;
-                       if (map->q->bufs[i]->map != map)
+                       if (q->bufs[i]->map != map)
                                continue;
-                       map->q->bufs[i]->map   = NULL;
-                       map->q->bufs[i]->baddr = 0;
-                       map->q->ops->buf_release(vma->vm_file,map->q->bufs[i]);
+                       q->bufs[i]->map   = NULL;
+                       q->bufs[i]->baddr = 0;
+                       q->ops->buf_release(q,q->bufs[i]);
                }
+               up(&q->lock);
                kfree(map);
        }
-       /* up(&fh->lock); FIXME */
        return;
 }
 
@@ -1082,7 +1096,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
 
        dprintk(3,"nopage: fault @ %08lx [vma %08lx-%08lx]\n",
                vaddr,vma->vm_start,vma->vm_end);
-        if (vaddr > vma->vm_end)
+       if (vaddr > vma->vm_end)
                return NOPAGE_SIGBUS;
        page = alloc_page(GFP_USER);
        if (!page)
@@ -1100,14 +1114,14 @@ static struct vm_operations_struct videobuf_vm_ops =
        .nopage   = videobuf_vm_nopage,
 };
 
-int videobuf_mmap_setup(struct file *file, struct videobuf_queue *q,
+int videobuf_mmap_setup(struct videobuf_queue *q,
                        unsigned int bcount, unsigned int bsize,
                        enum v4l2_memory memory)
 {
        unsigned int i;
        int err;
 
-       err = videobuf_mmap_free(file,q);
+       err = videobuf_mmap_free(q);
        if (0 != err)
                return err;
 
@@ -1132,7 +1146,7 @@ int videobuf_mmap_setup(struct file *file, struct videobuf_queue *q,
        return 0;
 }
 
-int videobuf_mmap_free(struct file *file, struct videobuf_queue *q)
+int videobuf_mmap_free(struct videobuf_queue *q)
 {
        int i;
 
@@ -1142,15 +1156,15 @@ int videobuf_mmap_free(struct file *file, struct videobuf_queue *q)
        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                if (NULL == q->bufs[i])
                        continue;
-               q->ops->buf_release(file,q->bufs[i]);
+               q->ops->buf_release(q,q->bufs[i]);
                kfree(q->bufs[i]);
                q->bufs[i] = NULL;
        }
        return 0;
 }
 
-int videobuf_mmap_mapper(struct vm_area_struct *vma,
-                        struct videobuf_queue *q)
+int videobuf_mmap_mapper(struct videobuf_queue *q,
+                        struct vm_area_struct *vma)
 {
        struct videobuf_mapping *map;
        unsigned int first,last,size,i;
@@ -1219,8 +1233,8 @@ int videobuf_mmap_mapper(struct vm_area_struct *vma,
        vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED;
        vma->vm_flags &= ~VM_IO; /* using shared anonymous pages */
        vma->vm_private_data = map;
-       dprintk(1,"mmap %p: %08lx-%08lx pgoff %08lx bufs %d-%d\n",
-               map,vma->vm_start,vma->vm_end,vma->vm_pgoff,first,last);
+       dprintk(1,"mmap %p: q=%p %08lx-%08lx pgoff %08lx bufs %d-%d\n",
+               map,q,vma->vm_start,vma->vm_end,vma->vm_pgoff,first,last);
        retval = 0;
 
  done: