V4L/DVB: videobuf: add ext_lock argument to the queue init functions (part 2)
Hans Verkuil [Thu, 30 Sep 2010 12:18:52 +0000 (09:18 -0300)]
Missed a few init functions on non-Intel platforms the first time :-(

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

13 files changed:
drivers/media/video/davinci/vpfe_capture.c
drivers/media/video/davinci/vpif_capture.c
drivers/media/video/davinci/vpif_display.c
drivers/media/video/fsl-viu.c
drivers/media/video/mx1_camera.c
drivers/media/video/mx2_camera.c
drivers/media/video/mx3_camera.c
drivers/media/video/omap/omap_vout.c
drivers/media/video/omap24xxcam.c
drivers/media/video/pxa_camera.c
drivers/media/video/s5p-fimc/fimc-core.c
drivers/media/video/sh_mobile_ceu_camera.c
drivers/media/video/sh_vou.c

index b391125..cd068de 100644 (file)
@@ -1372,7 +1372,7 @@ static int vpfe_reqbufs(struct file *file, void *priv,
                                req_buf->type,
                                vpfe_dev->fmt.fmt.pix.field,
                                sizeof(struct videobuf_buffer),
-                               fh);
+                               fh, NULL);
 
        fh->io_allowed = 1;
        vpfe_dev->io_usrs = 1;
index 730bd4c..109ab8d 100644 (file)
@@ -927,7 +927,8 @@ static int vpif_reqbufs(struct file *file, void *priv,
                                            &common->irqlock,
                                            reqbuf->type,
                                            common->fmt.fmt.pix.field,
-                                           sizeof(struct videobuf_buffer), fh);
+                                           sizeof(struct videobuf_buffer), fh,
+                                           NULL);
 
        /* Set io allowed member of file handle to TRUE */
        fh->io_allowed[index] = 1;
index 912c27b..8894af2 100644 (file)
@@ -853,7 +853,8 @@ static int vpif_reqbufs(struct file *file, void *priv,
                                            &video_qops, NULL,
                                            &common->irqlock,
                                            reqbuf->type, field,
-                                           sizeof(struct videobuf_buffer), fh);
+                                           sizeof(struct videobuf_buffer), fh,
+                                           NULL);
 
        /* Set io allowed member of file handle to TRUE */
        fh->io_allowed[index] = 1;
index 211e839..5c57bab 100644 (file)
@@ -1288,7 +1288,7 @@ static int viu_open(struct file *file)
        videobuf_queue_dma_contig_init(&fh->vb_vidq, &viu_video_qops,
                                       dev->dev, &fh->vbq_lock,
                                       fh->type, V4L2_FIELD_INTERLACED,
-                                      sizeof(struct viu_buf), fh);
+                                      sizeof(struct viu_buf), fh, NULL);
        return 0;
 }
 
index adc72c4..5e486a8 100644 (file)
@@ -385,7 +385,7 @@ static void mx1_camera_init_videobuf(struct videobuf_queue *q,
                                        &pcdev->lock,
                                        V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                        V4L2_FIELD_NONE,
-                                       sizeof(struct mx1_buffer), icd);
+                                       sizeof(struct mx1_buffer), icd, NULL);
 }
 
 static int mclk_get_divisor(struct mx1_camera_dev *pcdev)
index e330a76..4a27862 100644 (file)
@@ -682,7 +682,7 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q,
 
        videobuf_queue_dma_contig_init(q, &mx2_videobuf_ops, pcdev->dev,
                        &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                       V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd);
+                       V4L2_FIELD_NONE, sizeof(struct mx2_buffer), icd, NULL);
 }
 
 #define MX2_BUS_FLAGS  (SOCAM_DATAWIDTH_8 | \
index d020388..29c5fc3 100644 (file)
@@ -441,7 +441,8 @@ static void mx3_camera_init_videobuf(struct videobuf_queue *q,
                                       &mx3_cam->lock,
                                       V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                       V4L2_FIELD_NONE,
-                                      sizeof(struct mx3_camera_buffer), icd);
+                                      sizeof(struct mx3_camera_buffer), icd,
+                                      NULL);
 }
 
 /* First part of ipu_csi_init_interface() */
index 4ed51b1..15f8793 100644 (file)
@@ -1341,7 +1341,7 @@ static int omap_vout_open(struct file *file)
 
        videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
                        &vout->vbq_lock, vout->type, V4L2_FIELD_NONE,
-                       sizeof(struct videobuf_buffer), vout);
+                       sizeof(struct videobuf_buffer), vout, NULL);
 
        v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Exiting %s\n", __func__);
        return 0;
index 13c09f5..378b094 100644 (file)
@@ -1491,7 +1491,7 @@ static int omap24xxcam_open(struct file *file)
        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);
+                               sizeof(struct videobuf_buffer), fh, NULL);
 
        return 0;
 
index 7ffa525..c143ed0 100644 (file)
@@ -852,7 +852,7 @@ static void pxa_camera_init_videobuf(struct videobuf_queue *q,
         */
        videobuf_queue_sg_init(q, &pxa_videobuf_ops, NULL, &pcdev->lock,
                                V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
-                               sizeof(struct pxa_buffer), icd);
+                               sizeof(struct pxa_buffer), icd, NULL);
 }
 
 static u32 mclk_get_divisor(struct platform_device *pdev,
index 6961c55..c56029e 100644 (file)
@@ -1138,7 +1138,7 @@ static void queue_init(void *priv, struct videobuf_queue *vq,
        videobuf_queue_dma_contig_init(vq, &fimc_qops,
                fimc->m2m.v4l2_dev.dev,
                &fimc->irqlock, type, V4L2_FIELD_NONE,
-               sizeof(struct fimc_vid_buffer), priv);
+               sizeof(struct fimc_vid_buffer), priv, NULL);
 }
 
 static int fimc_m2m_open(struct file *file)
index cbc997d..b11e749 100644 (file)
@@ -1786,7 +1786,7 @@ static void sh_mobile_ceu_init_videobuf(struct videobuf_queue *q,
                                       V4L2_BUF_TYPE_VIDEO_CAPTURE,
                                       pcdev->field,
                                       sizeof(struct sh_mobile_ceu_buffer),
-                                      icd);
+                                      icd, NULL);
 }
 
 static int sh_mobile_ceu_get_parm(struct soc_camera_device *icd,
index d3acd02..195ac86 100644 (file)
@@ -1189,7 +1189,8 @@ static int sh_vou_open(struct file *file)
                                       vou_dev->v4l2_dev.dev, &vou_dev->lock,
                                       V4L2_BUF_TYPE_VIDEO_OUTPUT,
                                       V4L2_FIELD_NONE,
-                                      sizeof(struct videobuf_buffer), vdev);
+                                      sizeof(struct videobuf_buffer), vdev,
+                                      NULL);
 
        return 0;
 }