[media] media: videobuf2: Move timestamp to vb2_buffer

[deliverable/linux.git] / drivers / media / pci / solo6x10 / solo6x10-v4l2-enc.c

diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 4432fd69b7cbf86db946fb9aa6bfa753cb21434c..67a14c41c227ac3e44643202982eb1c6bf543ef3 100644 (file)
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -531,8 +531,7 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
 
        if (!ret) {
                vbuf->sequence = solo_enc->sequence++;
-               vbuf->timestamp.tv_sec = vop_sec(vh);
-               vbuf->timestamp.tv_usec = vop_usec(vh);
+               vb->timestamp = ktime_get_ns();
 
                /* Check for motion flags */
                if (solo_is_motion_on(solo_enc) && enc_buf->motion) {
@@ -663,7 +662,6 @@ static int solo_ring_thread(void *data)
 }
 
 static int solo_enc_queue_setup(struct vb2_queue *q,
-                               const void *parg,
                                unsigned int *num_buffers,
                                unsigned int *num_planes, unsigned int sizes[],
                                void *alloc_ctxs[])