Merge mainline v2.6.27-rc2 tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / media / video / omap24xxcam.c

diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
index 7e0c6cafa159155124df765ee98e932f0ca0af33..6793869fcf58599cf15c62e533818b0e23ec9808 100644 (file)
--- a/drivers/media/video/omap24xxcam.c
+++ b/drivers/media/video/omap24xxcam.c
@@ -37,6 +37,7 @@
 #include <linux/io.h>
 
 #include <media/v4l2-common.h>
+#include <media/v4l2-ioctl.h>
 
 #include "omap24xxcam.h"
 
@@ -255,7 +256,7 @@ static void omap24xxcam_vbq_free_mmap_buffers(struct videobuf_queue *vbq)
 {
        int i;
 
-       mutex_lock(&vbq->lock);
+       mutex_lock(&vbq->vb_lock);
 
        for (i = 0; i < VIDEO_MAX_FRAME; i++) {
                if (NULL == vbq->bufs[i])
@@ -268,7 +269,7 @@ static void omap24xxcam_vbq_free_mmap_buffers(struct videobuf_queue *vbq)
                vbq->bufs[i] = NULL;
        }
 
-       mutex_unlock(&vbq->lock);
+       mutex_unlock(&vbq->vb_lock);
 
        videobuf_mmap_free(vbq);
 }
@@ -354,7 +355,7 @@ static int omap24xxcam_vbq_alloc_mmap_buffers(struct videobuf_queue *vbq,
        struct omap24xxcam_fh *fh =
                container_of(vbq, struct omap24xxcam_fh, vbq);
 
-       mutex_lock(&vbq->lock);
+       mutex_lock(&vbq->vb_lock);
 
        for (i = 0; i < count; i++) {
                err = omap24xxcam_vbq_alloc_mmap_buffer(vbq->bufs[i]);
@@ -364,7 +365,7 @@ static int omap24xxcam_vbq_alloc_mmap_buffers(struct videobuf_queue *vbq,
                        videobuf_to_dma(vbq->bufs[i])->sglen, i);
        }
 
-       mutex_unlock(&vbq->lock);
+       mutex_unlock(&vbq->vb_lock);
 
        return 0;
 out:
@@ -373,7 +374,7 @@ out:
                omap24xxcam_vbq_free_mmap_buffer(vbq->bufs[i]);
        }
 
-       mutex_unlock(&vbq->lock);
+       mutex_unlock(&vbq->vb_lock);
 
        return err;
 }
@@ -1041,9 +1042,9 @@ out:
        mutex_unlock(&cam->mutex);
 
        if (!rval) {
-               mutex_lock(&ofh->vbq.lock);
+               mutex_lock(&ofh->vbq.vb_lock);
                ofh->pix = f->fmt.pix;
-               mutex_unlock(&ofh->vbq.lock);
+               mutex_unlock(&ofh->vbq.vb_lock);
        }
 
        memset(f, 0, sizeof(*f));
@@ -1354,13 +1355,13 @@ static unsigned int omap24xxcam_poll(struct file *file,
        }
        mutex_unlock(&cam->mutex);
 
-       mutex_lock(&fh->vbq.lock);
+       mutex_lock(&fh->vbq.vb_lock);
        if (list_empty(&fh->vbq.stream)) {
-               mutex_unlock(&fh->vbq.lock);
+               mutex_unlock(&fh->vbq.vb_lock);
                return POLLERR;
        }
        vb = list_entry(fh->vbq.stream.next, struct videobuf_buffer, stream);
-       mutex_unlock(&fh->vbq.lock);
+       mutex_unlock(&fh->vbq.vb_lock);
 
        poll_wait(file, &vb->done, wait);
 
@@ -1385,7 +1386,7 @@ static int omap24xxcam_mmap_buffers(struct file *file,
                return -EBUSY;
        }
        mutex_unlock(&cam->mutex);
-       mutex_lock(&vbq->lock);
+       mutex_lock(&vbq->vb_lock);
 
        /* look for first buffer to map */
        for (first = 0; first < VIDEO_MAX_FRAME; first++) {
@@ -1424,7 +1425,7 @@ static int omap24xxcam_mmap_buffers(struct file *file,
        }
 
 out:
-       mutex_unlock(&vbq->lock);
+       mutex_unlock(&vbq->vb_lock);
 
        return err;
 }
@@ -1493,7 +1494,7 @@ static int omap24xxcam_open(struct inode *inode, struct file *file)
 
        spin_lock_init(&fh->vbq_lock);
 
-       videobuf_queue_pci_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
+       videobuf_queue_sg_init(&fh->vbq, &omap24xxcam_vbq_ops, NULL,
                                &fh->vbq_lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                V4L2_FIELD_NONE,
                                sizeof(struct videobuf_buffer), fh);
@@ -1559,7 +1560,6 @@ static int omap24xxcam_release(struct inode *inode, struct file *file)
 }
 
 static struct file_operations omap24xxcam_fops = {
-       .owner   = THIS_MODULE,
        .llseek  = no_llseek,
        .ioctl   = video_ioctl2,
        .poll    = omap24xxcam_poll,