Skip to content

Commit

Permalink
[media] v4l: Rename vb2_queue.timestamp_type as timestamp_flags
Browse files Browse the repository at this point in the history 
The timestamp_type field used to contain only the timestamp type. Soon it
will be used for timestamp source flags as well. Rename the field
accordingly.

[[email protected]: do the change also to drivers/staging/media and at s2255]
Signed-off-by: Sakari Ailus <[email protected]>
Acked-by: Hans Verkuil <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
@mchehab
Sakari Ailus authored and mchehab committed Mar 5, 2014
1 parent 939f137 commit ade4868
Show file tree
Hide file tree
Showing 39 changed files with 53 additions and 53 deletions.
2 changes: 1 addition & 1 deletion drivers/media/parport/bw-qcam.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,7 @@ static struct qcam *qcam_init(struct parport *port)
q->drv_priv = qcam;
q->ops = &qcam_video_qops;
q->mem_ops = &vb2_vmalloc_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
err = vb2_queue_init(q);
if (err < 0) {
v4l2_err(v4l2_dev, "couldn't init vb2_queue for %s.\n", port->name);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/blackfin/bfin_capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ static int bcap_probe(struct platform_device *pdev)
q->buf_struct_size = sizeof(struct bcap_buffer);
q->ops = &bcap_video_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret)
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/coda.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2428,7 +2428,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &coda_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

ret = vb2_queue_init(src_vq);
if (ret)
Expand All @@ -2440,7 +2440,7 @@ static int coda_queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &coda_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

return vb2_queue_init(dst_vq);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpbe_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ static int vpbe_display_reqbufs(struct file *file, void *priv,
q->ops = &video_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpif_capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1023,7 +1023,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
q->ops = &video_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct vpif_cap_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/davinci/vpif_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ static int vpif_reqbufs(struct file *file, void *priv,
q->ops = &video_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct vpif_disp_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/exynos-gsc/gsc-m2m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->ops = &gsc_m2m_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

ret = vb2_queue_init(src_vq);
if (ret)
Expand All @@ -603,7 +603,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->ops = &gsc_m2m_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

return vb2_queue_init(dst_vq);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/exynos4-is/fimc-capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc,
q->ops = &fimc_capture_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct fimc_vid_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->lock = &fimc->lock;

ret = vb2_queue_init(q);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/exynos4-is/fimc-lite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1313,7 +1313,7 @@ static int fimc_lite_subdev_registered(struct v4l2_subdev *sd)
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct flite_buffer);
q->drv_priv = fimc;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->lock = &fimc->lock;

ret = vb2_queue_init(q);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/exynos4-is/fimc-m2m.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->ops = &fimc_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &ctx->fimc_dev->lock;

ret = vb2_queue_init(src_vq);
Expand All @@ -570,7 +570,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->ops = &fimc_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &ctx->fimc_dev->lock;

return vb2_queue_init(dst_vq);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/m2m-deinterlace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &deinterlace_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
q_data[V4L2_M2M_SRC].fmt = &formats[0];
q_data[V4L2_M2M_SRC].width = 640;
q_data[V4L2_M2M_SRC].height = 480;
Expand All @@ -885,7 +885,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &deinterlace_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
q_data[V4L2_M2M_DST].fmt = &formats[0];
q_data[V4L2_M2M_DST].width = 640;
q_data[V4L2_M2M_DST].height = 480;
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/mem2mem_testdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -777,7 +777,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &m2mtest_qops;
src_vq->mem_ops = &vb2_vmalloc_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &ctx->dev->dev_mutex;

ret = vb2_queue_init(src_vq);
Expand All @@ -790,7 +790,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &m2mtest_qops;
dst_vq->mem_ops = &vb2_vmalloc_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &ctx->dev->dev_mutex;

return vb2_queue_init(dst_vq);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/mx2_emmaprp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &emmaprp_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

ret = vb2_queue_init(src_vq);
if (ret)
Expand All @@ -778,7 +778,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &emmaprp_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

return vb2_queue_init(dst_vq);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/s3c-camif/camif-capture.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,7 +1160,7 @@ int s3c_camif_register_video_node(struct camif_dev *camif, int idx)
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct camif_buffer);
q->drv_priv = vp;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret)
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/s5p-g2d/g2d.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->ops = &g2d_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &ctx->dev->mutex;

ret = vb2_queue_init(src_vq);
Expand All @@ -170,7 +170,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->ops = &g2d_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &ctx->dev->mutex;

return vb2_queue_init(dst_vq);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/s5p-jpeg/jpeg-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1701,7 +1701,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &s5p_jpeg_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->lock = &ctx->jpeg->lock;

ret = vb2_queue_init(src_vq);
Expand All @@ -1714,7 +1714,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &s5p_jpeg_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->lock = &ctx->jpeg->lock;

return vb2_queue_init(dst_vq);
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/s5p-mfc/s5p_mfc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ static int s5p_mfc_open(struct file *file)
goto err_queue_init;
}
q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
ret = vb2_queue_init(q);
if (ret) {
mfc_err("Failed to initialize videobuf2 queue(capture)\n");
Expand All @@ -816,7 +816,7 @@ static int s5p_mfc_open(struct file *file)
goto err_queue_init;
}
q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
ret = vb2_queue_init(q);
if (ret) {
mfc_err("Failed to initialize videobuf2 queue(output)\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/atmel-isi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static int isi_camera_init_videobuf(struct vb2_queue *q,
q->buf_struct_size = sizeof(struct frame_buffer);
q->ops = &isi_video_qops;
q->mem_ops = &vb2_dma_contig_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

return vb2_queue_init(q);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/mx2_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ static int mx2_camera_init_videobuf(struct vb2_queue *q,
q->ops = &mx2_videobuf_ops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct mx2_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

return vb2_queue_init(q);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/mx3_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ static int mx3_camera_init_videobuf(struct vb2_queue *q,
q->ops = &mx3_videobuf_ops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct mx3_camera_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

return vb2_queue_init(q);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/rcar_vin.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@ static int rcar_vin_init_videobuf2(struct vb2_queue *vq,
vq->ops = &rcar_vin_vb2_ops;
vq->mem_ops = &vb2_dma_contig_memops;
vq->buf_struct_size = sizeof(struct rcar_vin_buffer);
vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

return vb2_queue_init(vq);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1665,7 +1665,7 @@ static int sh_mobile_ceu_init_videobuf(struct vb2_queue *q,
q->ops = &sh_mobile_ceu_videobuf_ops;
q->mem_ops = &vb2_dma_contig_memops;
q->buf_struct_size = sizeof(struct sh_mobile_ceu_buffer);
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

return vb2_queue_init(q);
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/platform/ti-vpe/vpe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1770,7 +1770,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq->ops = &vpe_qops;
src_vq->mem_ops = &vb2_dma_contig_memops;
src_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

ret = vb2_queue_init(src_vq);
if (ret)
Expand All @@ -1783,7 +1783,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq,
dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq->ops = &vpe_qops;
dst_vq->mem_ops = &vb2_dma_contig_memops;
dst_vq->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;

return vb2_queue_init(dst_vq);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/vivi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ static int __init vivi_create_instance(int inst)
q->buf_struct_size = sizeof(struct vivi_buffer);
q->ops = &vivi_video_qops;
q->mem_ops = &vb2_vmalloc_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

ret = vb2_queue_init(q);
if (ret)
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/vsp1/vsp1_video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,7 @@ int vsp1_video_init(struct vsp1_video *video, struct vsp1_entity *rwpf)
video->queue.buf_struct_size = sizeof(struct vsp1_video_buffer);
video->queue.ops = &vsp1_video_queue_qops;
video->queue.mem_ops = &vb2_dma_contig_memops;
video->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_COPY;
video->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
ret = vb2_queue_init(&video->queue);
if (ret < 0) {
dev_err(video->vsp1->dev, "failed to initialize vb2 queue\n");
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/usb/em28xx/em28xx-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
q = &dev->vb_vidq;
q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->drv_priv = dev;
q->buf_struct_size = sizeof(struct em28xx_buffer);
q->ops = &em28xx_video_qops;
Expand All @@ -1043,7 +1043,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
q = &dev->vb_vbiq;
q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
q->io_modes = VB2_READ | VB2_MMAP | VB2_USERPTR;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->drv_priv = dev;
q->buf_struct_size = sizeof(struct em28xx_buffer);
q->ops = &em28xx_vbi_qops;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/usb/pwc/pwc-if.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1001,7 +1001,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
pdev->vb_queue.buf_struct_size = sizeof(struct pwc_frame_buf);
pdev->vb_queue.ops = &pwc_vb_queue_ops;
pdev->vb_queue.mem_ops = &vb2_vmalloc_memops;
pdev->vb_queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
pdev->vb_queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
rc = vb2_queue_init(&pdev->vb_queue);
if (rc < 0) {
PWC_ERROR("Oops, could not initialize vb2 queue.\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/usb/s2255/s2255drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1664,7 +1664,7 @@ static int s2255_probe_v4l(struct s2255_dev *dev)
q->buf_struct_size = sizeof(struct s2255_buffer);
q->mem_ops = &vb2_vmalloc_memops;
q->ops = &s2255_video_qops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
ret = vb2_queue_init(q);
if (ret != 0) {
dev_err(&dev->udev->dev,
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/usb/stk1160/stk1160-v4l.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ int stk1160_vb2_setup(struct stk1160 *dev)
q->buf_struct_size = sizeof(struct stk1160_buffer);
q->ops = &stk1160_video_qops;
q->mem_ops = &vb2_vmalloc_memops;
q->timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;

rc = vb2_queue_init(q);
if (rc < 0)
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/usb/usbtv/usbtv-video.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ int usbtv_video_init(struct usbtv *usbtv)
usbtv->vb2q.buf_struct_size = sizeof(struct usbtv_buf);
usbtv->vb2q.ops = &usbtv_vb2_ops;
usbtv->vb2q.mem_ops = &vb2_vmalloc_memops;
usbtv->vb2q.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
usbtv->vb2q.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
usbtv->vb2q.lock = &usbtv->vb2q_lock;
ret = vb2_queue_init(&usbtv->vb2q);
if (ret < 0) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/usb/uvc/uvc_queue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
queue->queue.buf_struct_size = sizeof(struct uvc_buffer);
queue->queue.ops = &uvc_queue_qops;
queue->queue.mem_ops = &vb2_vmalloc_memops;
queue->queue.timestamp_type = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
queue->queue.timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
ret = vb2_queue_init(&queue->queue);
if (ret)
return ret;
Expand Down
Loading

0 comments on commit ade4868

Please sign in to comment.