[media] cx18: use setup_timer

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index 7c93814489667e621f881aa039fedf656939504e..3c45e007153074c179cb8e2b4ba8083dfd04e801 100644 (file)
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -282,9 +282,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
        INIT_WORK(&s->out_work_order, cx18_out_work_handler);
 
        INIT_LIST_HEAD(&s->vb_capture);
-       s->vb_timeout.function = cx18_vb_timeout;
-       s->vb_timeout.data = (unsigned long)s;
-       init_timer(&s->vb_timeout);
+       setup_timer(&s->vb_timeout, cx18_vb_timeout, (unsigned long)s);
        spin_lock_init(&s->vb_lock);
        if (type == CX18_ENC_STREAM_TYPE_YUV) {
                spin_lock_init(&s->vbuf_q_lock);