media: uvcvideo: Use ktime_t for stats

'struct timespec' works fine here, but we try to migrate
away from it in favor of ktime_t or timespec64. In this
case, using ktime_t produces the simplest code.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index 73cd44e8bd81f13cd5aed90ac37b5a6ac343aa9c..d468332abe0d03fbe42713c8c72210bb37c4414d 100644 (file)
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -725,7 +725,7 @@ static void uvc_video_stats_decode(struct uvc_streaming *stream,
 
        if (stream->stats.stream.nb_frames == 0 &&
            stream->stats.frame.nb_packets == 0)
-               ktime_get_ts(&stream->stats.stream.start_ts);
+               stream->stats.stream.start_ts = ktime_get();
 
        switch (data[1] & (UVC_STREAM_PTS | UVC_STREAM_SCR)) {
        case UVC_STREAM_PTS | UVC_STREAM_SCR:
@@ -865,16 +865,13 @@ size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,
 {
        unsigned int scr_sof_freq;
        unsigned int duration;
-       struct timespec ts;
        size_t count = 0;
 
-       ts = timespec_sub(stream->stats.stream.stop_ts,
-                         stream->stats.stream.start_ts);
-
        /* Compute the SCR.SOF frequency estimate. At the nominal 1kHz SOF
         * frequency this will not overflow before more than 1h.
         */
-       duration = ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
+       duration = ktime_ms_delta(stream->stats.stream.stop_ts,
+                                 stream->stats.stream.start_ts);
        if (duration != 0)
                scr_sof_freq = stream->stats.stream.scr_sof_count * 1000
                             / duration;
@@ -915,7 +912,7 @@ static void uvc_video_stats_start(struct uvc_streaming *stream)
 
 static void uvc_video_stats_stop(struct uvc_streaming *stream)
 {
-       ktime_get_ts(&stream->stats.stream.stop_ts);
+       stream->stats.stream.stop_ts = ktime_get();
 }
 
 /* ------------------------------------------------------------------------

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 19e725e2bda5b4940e865f9ef1d0962bd8fc1d91..94392a3256e881b1556f3626db1a21ad8e4346b8 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -457,8 +457,8 @@ struct uvc_stats_frame {
 };
 
 struct uvc_stats_stream {
-       struct timespec start_ts;       /* Stream start timestamp */
-       struct timespec stop_ts;        /* Stream stop timestamp */
+       ktime_t start_ts;               /* Stream start timestamp */
+       ktime_t stop_ts;                /* Stream stop timestamp */
 
        unsigned int nb_frames;         /* Number of frames */