Commit ade48681 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: Rename vb2_queue.timestamp_type as timestamp_flags 



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.

[m.chehab@samsung.com: do the change also to drivers/staging/media and at s2255]
Signed-off-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 939f1377

drivers/media/parport/bw-qcam.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/platform/blackfin/bfin_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/media/platform/coda.c

+2 −2
Original line number Diff line number Diff line
@@ -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)
@@ -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);

}

drivers/media/platform/davinci/vpbe_display.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/media/platform/davinci/vpif_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE