18 files changed, 25 insertions, 32 deletions

diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index ec476ef5b709..d422d3c379e4 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -484,15 +484,13 @@ static irqreturn_t bcap_isr(int irq, void *dev_id)
 {
         struct ppi_if *ppi = dev_id;
         struct bcap_device *bcap_dev = ppi->priv;
-        struct timeval timevalue;
         struct vb2_buffer *vb = &bcap_dev->cur_frm->vb;
         dma_addr_t addr;
 
         spin_lock(&bcap_dev->lock);
 
         if (bcap_dev->cur_frm != bcap_dev->next_frm) {
-                do_gettimeofday(&timevalue);
-                vb->v4l2_buf.timestamp = timevalue;
+                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
                 vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
                 bcap_dev->cur_frm = bcap_dev->next_frm;
         }
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index 8be492cd8ed4..65f4264bd5b4 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -560,10 +560,7 @@ static void vpfe_schedule_bottom_field(struct vpfe_device *vpfe_dev)
 
 static void vpfe_process_buffer_complete(struct vpfe_device *vpfe_dev)
 {
-        struct timeval timevalue;
-
-        do_gettimeofday(&timevalue);
-        vpfe_dev->cur_frm->ts = timevalue;
+        v4l2_get_timestamp(&vpfe_dev->cur_frm->ts);
         vpfe_dev->cur_frm->state = VIDEOBUF_DONE;
         vpfe_dev->cur_frm->size = vpfe_dev->fmt.fmt.pix.sizeimage;
         wake_up_interruptible(&vpfe_dev->cur_frm->done);
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index a409ccefb380..5892d2bc8eee 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -411,7 +411,7 @@ static struct vb2_ops video_qops = {
  */
 static void vpif_process_buffer_complete(struct common_obj *common)
 {
-        do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
         vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
         /* Make curFrm pointing to nextFrm */
diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 9f2b603be9c9..dd249c96126d 100644
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -402,7 +402,7 @@ static void process_interlaced_mode(int fid, struct common_obj *common)
                 /* one frame is displayed If next frame is
                  *  available, release cur_frm and move on */
                 /* Copy frame display time */
-                do_gettimeofday(&common->cur_frm->vb.v4l2_buf.timestamp);
+                v4l2_get_timestamp(&common->cur_frm->vb.v4l2_buf.timestamp);
                 /* Change status of the cur_frm */
                 vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
@@ -462,8 +462,8 @@ static irqreturn_t vpif_channel_isr(int irq, void *dev_id)
                         if (!channel_first_int[i][channel_id]) {
                                 /* Mark status of the cur_frm to
                                  * done and unlock semaphore on it */
-                                do_gettimeofday(&common->cur_frm->vb.
-                                                v4l2_buf.timestamp);
+                                v4l2_get_timestamp(&common->cur_frm->vb.
+                                                   v4l2_buf.timestamp);
                                 vb2_buffer_done(&common->cur_frm->vb,
                                             VB2_BUF_STATE_DONE);
                                 /* Make cur_frm pointing to next_frm */
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index a8ddb0cacab8..d464509d0f0e 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1181,7 +1181,7 @@ static void viu_capture_intr(struct viu_dev *dev, u32 status)
 
                 if (waitqueue_active(&buf->vb.done)) {
                         list_del(&buf->vb.queue);
-                        do_gettimeofday(&buf->vb.ts);
+                        v4l2_get_timestamp(&buf->vb.ts);
                         buf->vb.state = VIDEOBUF_DONE;
                         buf->vb.field_count++;
                         wake_up(&buf->vb.done);
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index f7ad54106bc5..c74b0d48dcd6 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -597,7 +597,7 @@ static void omap_vout_isr(void *arg, unsigned int irqstatus)
                 return;
 
         spin_lock(&vout->vbq_lock);
-        do_gettimeofday(&timevalue);
+        v4l2_get_timestamp(&timevalue);
 
         switch (cur_display->type) {
         case OMAP_DISPLAY_TYPE_DSI:
diff --git a/drivers/media/platform/omap24xxcam.c b/drivers/media/platform/omap24xxcam.c
index 70f45c381318..eda3274abf8e 100644
--- a/drivers/media/platform/omap24xxcam.c
+++ b/drivers/media/platform/omap24xxcam.c
@@ -402,7 +402,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma,
                 omap24xxcam_core_disable(cam);
         spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
 
-        do_gettimeofday(&vb->ts);
+        v4l2_get_timestamp(&vb->ts);
         vb->field_count = atomic_add_return(2, &fh->field_count);
         if (csr & csr_error) {
                 vb->state = VIDEOBUF_ERROR;
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index 7494858a2158..1039ae82401b 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -1092,7 +1092,7 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id)
         list_del(&vb->queue);
 
         vb->state = VIDEOBUF_DONE;
-        do_gettimeofday(&vb->ts);
+        v4l2_get_timestamp(&vb->ts);
         vb->field_count++;
         wake_up(&vb->done);
 
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 6274a91c25c7..c8d748a31944 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -166,7 +166,7 @@ static irqreturn_t atmel_isi_handle_streaming(struct atmel_isi *isi)
                 struct frame_buffer *buf = isi->active;
 
                 list_del_init(&buf->list);
-                do_gettimeofday(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
                 vb->v4l2_buf.sequence = isi->sequence++;
                 vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
         }
diff --git a/drivers/media/platform/soc_camera/mx1_camera.c b/drivers/media/platform/soc_camera/mx1_camera.c
index 032b8c9097f9..674ded646b66 100644
--- a/drivers/media/platform/soc_camera/mx1_camera.c
+++ b/drivers/media/platform/soc_camera/mx1_camera.c
@@ -307,7 +307,7 @@ static void mx1_camera_wakeup(struct mx1_camera_dev *pcdev,
         /* _init is used to debug races, see comment in mx1_camera_reqbufs() */
         list_del_init(&vb->queue);
         vb->state = VIDEOBUF_DONE;
-        do_gettimeofday(&vb->ts);
+        v4l2_get_timestamp(&vb->ts);
         vb->field_count++;
         wake_up(&vb->done);
 
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 2c148028d8c0..3c5ba63cd311 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -516,7 +516,7 @@ static void mx25_camera_frame_done(struct mx2_camera_dev *pcdev, int fb,
         dev_dbg(pcdev->dev, "%s (vb=0x%p) 0x%p %lu\n", __func__,
                 vb, vb2_plane_vaddr(vb, 0), vb2_get_plane_payload(vb, 0));
 
-        do_gettimeofday(&vb->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
         vb->v4l2_buf.sequence++;
         vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
 
@@ -1561,7 +1561,7 @@ static void mx27_camera_frame_done_emma(struct mx2_camera_dev *pcdev,
                                 vb2_get_plane_payload(vb, 0));
 
                 list_del_init(&buf->internal.queue);
-                do_gettimeofday(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
                 vb->v4l2_buf.sequence = pcdev->frame_count;
                 if (err)
                         vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 261f6e9e1b17..e6bc06bca496 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -156,7 +156,7 @@ static void mx3_cam_dma_done(void *arg)
                 struct mx3_camera_buffer *buf = to_mx3_vb(vb);
 
                 list_del_init(&buf->queue);
-                do_gettimeofday(&vb->v4l2_buf.timestamp);
+                v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
                 vb->v4l2_buf.field = mx3_cam->field;
                 vb->v4l2_buf.sequence = mx3_cam->sequence++;
                 vb2_buffer_done(vb, VB2_BUF_STATE_DONE);
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
index 13636a585106..b573bd5899de 100644
--- a/drivers/media/platform/soc_camera/omap1_camera.c
+++ b/drivers/media/platform/soc_camera/omap1_camera.c
@@ -591,7 +591,7 @@ static void videobuf_done(struct omap1_cam_dev *pcdev,
                         suspend_capture(pcdev);
                 }
                 vb->state = result;
-                do_gettimeofday(&vb->ts);
+                v4l2_get_timestamp(&vb->ts);
                 if (result != VIDEOBUF_ERROR)
                         vb->field_count++;
                 wake_up(&vb->done);
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index 3434ffe79c6e..8ff961eec39d 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -681,7 +681,7 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
         /* _init is used to debug races, see comment in pxa_camera_reqbufs() */
         list_del_init(&vb->queue);
         vb->state = VIDEOBUF_DONE;
-        do_gettimeofday(&vb->ts);
+        v4l2_get_timestamp(&vb->ts);
         vb->field_count++;
         wake_up(&vb->done);
         dev_dbg(pcdev->soc_host.v4l2_dev.dev, "%s dequeud buffer (vb=0x%p)\n",
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 27eeca15bbf0..9f021043cfe6 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -516,7 +516,7 @@ static irqreturn_t sh_mobile_ceu_irq(int irq, void *data)
                 pcdev->active = NULL;
 
         ret = sh_mobile_ceu_capture(pcdev);
-        do_gettimeofday(&vb->v4l2_buf.timestamp);
+        v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
         if (!ret) {
                 vb->v4l2_buf.field = pcdev->field;
                 vb->v4l2_buf.sequence = pcdev->sequence++;
diff --git a/drivers/media/platform/timblogiw.c b/drivers/media/platform/timblogiw.c
index 02194c056b00..9de014100a0f 100644
--- a/drivers/media/platform/timblogiw.c
+++ b/drivers/media/platform/timblogiw.c
@@ -130,7 +130,7 @@ static void timblogiw_dma_cb(void *data)
 
         if (vb->state != VIDEOBUF_ERROR) {
                 list_del(&vb->queue);
-                do_gettimeofday(&vb->ts);
+                v4l2_get_timestamp(&vb->ts);
                 vb->field_count = fh->frame_count * 2;
                 vb->state = VIDEOBUF_DONE;
 
diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c
index 70b0bf4b2900..28350e78b564 100644
--- a/drivers/media/platform/vino.c
+++ b/drivers/media/platform/vino.c
@@ -2474,8 +2474,8 @@ static irqreturn_t vino_interrupt(int irq, void *dev_id)
 
                 if ((!handled_a) && (done_a || skip_a)) {
                         if (!skip_a) {
-                                do_gettimeofday(&vino_drvdata->
-                                                a.int_data.timestamp);
+                                v4l2_get_timestamp(
+                                        &vino_drvdata->a.int_data.timestamp);
                                 vino_drvdata->a.int_data.frame_counter = fc_a;
                         }
                         vino_drvdata->a.int_data.skip = skip_a;
@@ -2489,8 +2489,8 @@ static irqreturn_t vino_interrupt(int irq, void *dev_id)
 
                 if ((!handled_b) && (done_b || skip_b)) {
                         if (!skip_b) {
-                                do_gettimeofday(&vino_drvdata->
-                                                b.int_data.timestamp);
+                                v4l2_get_timestamp(
+                                        &vino_drvdata->b.int_data.timestamp);
                                 vino_drvdata->b.int_data.frame_counter = fc_b;
                         }
                         vino_drvdata->b.int_data.skip = skip_b;
diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
index 0d59b9db83cb..c2f424f32450 100644
--- a/drivers/media/platform/vivi.c
+++ b/drivers/media/platform/vivi.c
@@ -554,7 +554,6 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
 {
         int wmax = dev->width;
         int hmax = dev->height;
-        struct timeval ts;
         void *vbuf = vb2_plane_vaddr(&buf->vb, 0);
         unsigned ms;
         char str[100];
@@ -622,8 +621,7 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf)
         buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
         dev->field_count++;
         buf->vb.v4l2_buf.sequence = dev->field_count >> 1;
-        do_gettimeofday(&ts);
-        buf->vb.v4l2_buf.timestamp = ts;
+        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
 }
 
 static void vivi_thread_tick(struct vivi_dev *dev)
@@ -645,7 +643,7 @@ static void vivi_thread_tick(struct vivi_dev *dev)
         list_del(&buf->list);
         spin_unlock_irqrestore(&dev->slock, flags);
 
-        do_gettimeofday(&buf->vb.v4l2_buf.timestamp);
+        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
 
         /* Fill buffer */
         vivi_fillbuff(dev, buf);