[media] use v4l2_get_timestamp where possible

This is a preparation for a change to the type of v4l2 timestamps.
v4l2_get_timestamp() is a helper function that reads the monotonic
time and stores it into a 'struct timeval'. Multiple drivers implement
the same thing themselves for historic reasons.

Changing them all to use v4l2_get_timestamp() is more consistent
and reduces the amount of code duplication, and most importantly
simplifies the following changes.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
[hans.verkuil@cisco.com: dropped the v4l2-dev.c patch that didn't belong here]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 3632958f21585dc093f11e431c3f54b9605ef167..15a4ebc2844d4f5882ea31cdf80c0f648b04a751 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -3625,13 +3625,10 @@ static void
 bttv_irq_wakeup_vbi(struct bttv *btv, struct bttv_buffer *wakeup,
                    unsigned int state)
 {
-       struct timeval ts;
-
        if (NULL == wakeup)
                return;
 
-       v4l2_get_timestamp(&ts);
-       wakeup->vb.ts = ts;
+       v4l2_get_timestamp(&wakeup->vb.ts);
        wakeup->vb.field_count = btv->field_count;
        wakeup->vb.state = state;
        wake_up(&wakeup->vb.done);

diff --git a/drivers/media/pci/cx18/cx18-mailbox.c b/drivers/media/pci/cx18/cx18-mailbox.c
index eabf00c6351b82365494d27bbac6ffd7c8a83c29..1f8aa9a749a1ed57e3a3e4e73fa379b165007c93 100644 (file)
--- a/drivers/media/pci/cx18/cx18-mailbox.c
+++ b/drivers/media/pci/cx18/cx18-mailbox.c
@@ -202,7 +202,7 @@ static void cx18_mdl_send_to_videobuf(struct cx18_stream *s,
        }
 
        if (dispatch) {
-               vb_buf->vb.ts = ktime_to_timeval(ktime_get());
+               v4l2_get_timestamp(&vb_buf->vb.ts);
                list_del(&vb_buf->vb.queue);
                vb_buf->vb.state = VIDEOBUF_DONE;
                wake_up(&vb_buf->vb.done);

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index ca6261a86a5f39a3c68424920f0f2979723d300a..459bc65b545dea69380191cf21ecc940e18df579 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -254,8 +254,6 @@ static irqreturn_t flite_irq_handler(int irq, void *priv)
        struct fimc_lite *fimc = priv;
        struct flite_buffer *vbuf;
        unsigned long flags;
-       struct timeval *tv;
-       struct timespec ts;
        u32 intsrc;
 
        spin_lock_irqsave(&fimc->slock, flags);
@@ -294,10 +292,7 @@ static irqreturn_t flite_irq_handler(int irq, void *priv)
            test_bit(ST_FLITE_RUN, &fimc->state) &&
            !list_empty(&fimc->active_buf_q)) {
                vbuf = fimc_lite_active_queue_pop(fimc);
-               ktime_get_ts(&ts);
-               tv = &vbuf->vb.v4l2_buf.timestamp;
-               tv->tv_sec = ts.tv_sec;
-               tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+               v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp);
                vbuf->vb.v4l2_buf.sequence = fimc->frame_count++;
                flite_hw_mask_dma_buffer(fimc, vbuf->index);
                vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE);

diff --git a/drivers/media/platform/omap3isp/ispstat.c b/drivers/media/platform/omap3isp/ispstat.c
index 20434e83e801c1bae242509e666321b63e2437c5..94d4c295d3d00ff4f3442f7c069c978ce4e00f07 100644 (file)
--- a/drivers/media/platform/omap3isp/ispstat.c
+++ b/drivers/media/platform/omap3isp/ispstat.c
@@ -235,7 +235,7 @@ static int isp_stat_buf_queue(struct ispstat *stat)
        if (!stat->active_buf)
                return STAT_NO_BUF;
 
-       ktime_get_ts(&stat->active_buf->ts);
+       v4l2_get_timestamp(&stat->active_buf->ts);
 
        stat->active_buf->buf_size = stat->buf_size;
        if (isp_stat_buf_check_magic(stat, stat->active_buf)) {
@@ -496,8 +496,7 @@ int omap3isp_stat_request_statistics(struct ispstat *stat,
                return PTR_ERR(buf);
        }
 
-       data->ts.tv_sec = buf->ts.tv_sec;
-       data->ts.tv_usec = buf->ts.tv_nsec / NSEC_PER_USEC;
+       data->ts = buf->ts;
        data->config_counter = buf->config_counter;
        data->frame_number = buf->frame_number;
        data->buf_size = buf->buf_size;

diff --git a/drivers/media/platform/omap3isp/ispstat.h b/drivers/media/platform/omap3isp/ispstat.h
index b79380d83fcfacb1f8e1ff43f5964b10db1df1b7..6d9b0244f3209d8b6b86911fe5a371fd3e9b8e1e 100644 (file)
--- a/drivers/media/platform/omap3isp/ispstat.h
+++ b/drivers/media/platform/omap3isp/ispstat.h
@@ -39,7 +39,7 @@ struct ispstat_buffer {
        struct sg_table sgt;
        void *virt_addr;
        dma_addr_t dma_addr;
-       struct timespec ts;
+       struct timeval ts;
        u32 buf_size;
        u32 frame_number;
        u16 config_counter;

diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 76e6289a5612d72d84ca404264ca87878f0f7188..edf70725ecf35d22bf65172ed4f9314c68e93a36 100644 (file)
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -328,23 +328,17 @@ irqreturn_t s3c_camif_irq_handler(int irq, void *priv)
            !list_empty(&vp->active_buf_q)) {
                unsigned int index;
                struct camif_buffer *vbuf;
-               struct timeval *tv;
-               struct timespec ts;
                /*
                 * Get previous DMA write buffer index:
                 * 0 => DMA buffer 0, 2;
                 * 1 => DMA buffer 1, 3.
                 */
                index = (CISTATUS_FRAMECNT(status) + 2) & 1;
-
-               ktime_get_ts(&ts);
                vbuf = camif_active_queue_peek(vp, index);
 
                if (!WARN_ON(vbuf == NULL)) {
                        /* Dequeue a filled buffer */
-                       tv = &vbuf->vb.v4l2_buf.timestamp;
-                       tv->tv_sec = ts.tv_sec;
-                       tv->tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+                       v4l2_get_timestamp(&vbuf->vb.v4l2_buf.timestamp);
                        vbuf->vb.v4l2_buf.sequence = vp->frame_sequence++;
                        vb2_buffer_done(&vbuf->vb, VB2_BUF_STATE_DONE);
 

diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index e54cee856a80cf5c44c47846e1a685c11972b853..af5cd8213e8bef2e1234660c7c2371c6765d712b 100644 (file)
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -436,7 +436,7 @@ void gspca_frame_add(struct gspca_dev *gspca_dev,
                }
                j = gspca_dev->fr_queue[i];
                frame = &gspca_dev->frame[j];
-               frame->v4l2_buf.timestamp = ktime_to_timeval(ktime_get());
+               v4l2_get_timestamp(&frame->v4l2_buf.timestamp);
                frame->v4l2_buf.sequence = gspca_dev->sequence++;
                gspca_dev->image = frame->data;
                gspca_dev->image_len = 0;
@@ -1909,7 +1909,7 @@ static ssize_t dev_read(struct file *file, char __user *data,
        }
 
        /* get a frame */
-       timestamp = ktime_to_timeval(ktime_get());
+       v4l2_get_timestamp(&timestamp);
        timestamp.tv_sec--;
        n = 2;
        for (;;) {

diff --git a/drivers/staging/media/omap4iss/iss_video.c b/drivers/staging/media/omap4iss/iss_video.c
index 40405d8710a65cf9ca61148970a1f1afebbe2f62..485a90ce12df8929b425b0ce7f70b70a6b0dced9 100644 (file)
--- a/drivers/staging/media/omap4iss/iss_video.c
+++ b/drivers/staging/media/omap4iss/iss_video.c
@@ -420,7 +420,6 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
        enum iss_pipeline_state state;
        struct iss_buffer *buf;
        unsigned long flags;
-       struct timespec ts;
 
        spin_lock_irqsave(&video->qlock, flags);
        if (WARN_ON(list_empty(&video->dmaqueue))) {
@@ -433,9 +432,7 @@ struct iss_buffer *omap4iss_video_buffer_next(struct iss_video *video)
        list_del(&buf->list);
        spin_unlock_irqrestore(&video->qlock, flags);
 
-       ktime_get_ts(&ts);
-       buf->vb.v4l2_buf.timestamp.tv_sec = ts.tv_sec;
-       buf->vb.v4l2_buf.timestamp.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
+       v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
 
        /* Do frame number propagation only if this is the output video node.
         * Frame number either comes from the CSI receivers or it gets