V4L/DVB: gspca - main: Use ktime instead of jiffies for buffer timestamping

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 222af479150b4baa2fea9444eeeb40010b95c20b..415949526eeccd29b2483f5571187db3f6d914b8 100644 (file)
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -35,7 +35,7 @@
 #include <linux/io.h>
 #include <asm/page.h>
 #include <linux/uaccess.h>
-#include <linux/jiffies.h>
+#include <linux/ktime.h>
 #include <media/v4l2-ioctl.h>
 
 #include "gspca.h"
@@ -442,8 +442,7 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
         * is not queued, discard the whole frame */
        if (packet_type == FIRST_PACKET) {
                frame->data_end = frame->data;
-               jiffies_to_timeval(get_jiffies_64(),
-                                  &frame->v4l2_buf.timestamp);
+               frame->v4l2_buf.timestamp = ktime_to_timeval(ktime_get());
                frame->v4l2_buf.sequence = ++gspca_dev->sequence;
        } else if (gspca_dev->last_packet_type == DISCARD_PACKET) {
                if (packet_type == LAST_PACKET)
@@ -2124,7 +2123,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
        }
 
        /* get a frame */
-       jiffies_to_timeval(get_jiffies_64(), &timestamp);
+       timestamp = ktime_to_timeval(ktime_get());
        timestamp.tv_sec--;
        n = 2;
        for (;;) {