media: usbvision: use u64 for the timestamp internally

Just like vb2 does, use u64 internally to store the timestamps
of the buffers. Only convert to timeval when interfacing with
userspace.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index 31e0e98d6dafe429d87c92e1d669174f96b26e21..2b843a7b27a43634392cdbea424263eccb676e0c 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -1160,7 +1160,7 @@ static void usbvision_parse_data(struct usb_usbvision *usbvision)
 
        if (newstate == parse_state_next_frame) {
                frame->grabstate = frame_state_done;
-               v4l2_get_timestamp(&(frame->timestamp));
+               frame->ts = ktime_get_ns();
                frame->sequence = usbvision->frame_num;
 
                spin_lock_irqsave(&usbvision->queue_lock, lock_flags);

diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index dd2ff8ed6c6a2b34949e99105853d251cf38295c..e611052ebf590ee788830139f1aa30f5942e17f6 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -706,7 +706,7 @@ static int vidioc_querybuf(struct file *file,
        vb->length = usbvision->curwidth *
                usbvision->curheight *
                usbvision->palette.bytes_per_pixel;
-       vb->timestamp = usbvision->frame[vb->index].timestamp;
+       vb->timestamp = ns_to_timeval(usbvision->frame[vb->index].ts);
        vb->sequence = usbvision->frame[vb->index].sequence;
        return 0;
 }
@@ -775,7 +775,7 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *vb)
                V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
        vb->index = f->index;
        vb->sequence = f->sequence;
-       vb->timestamp = f->timestamp;
+       vb->timestamp = ns_to_timeval(f->ts);
        vb->field = V4L2_FIELD_NONE;
        vb->bytesused = f->scanlength;
 

diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h
index 017e7baf57473b3ae5514314d36a254533669e58..d55088b4fd63c9e80e99602282ccfcff0ef2decb 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision.h
+++ b/drivers/media/usb/usbvision/usbvision.h
@@ -316,7 +316,7 @@ struct usbvision_frame {
        long bytes_read;                                /* amount of scanlength that has been read from data */
        struct usbvision_v4l2_format_st v4l2_format;    /* format the user needs*/
        int v4l2_linesize;                              /* bytes for one videoline*/
-       struct timeval timestamp;
+       u64 ts;
        int sequence;                                   /* How many video frames we send to user */
 };