[media] saa7146: 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/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c
index 49237518d65fb27dca2146ea5455b043b057bfbb..3553ac4cba5cba79e4fb68f6c20365bb95c40d61 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_vbi.c
+++ b/drivers/media/common/saa7146/saa7146_vbi.c
@@ -365,9 +365,8 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 
        INIT_LIST_HEAD(&vv->vbi_dmaq.queue);
 
-       init_timer(&vv->vbi_dmaq.timeout);
-       vv->vbi_dmaq.timeout.function = saa7146_buffer_timeout;
-       vv->vbi_dmaq.timeout.data     = (unsigned long)(&vv->vbi_dmaq);
+       setup_timer(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout,
+                   (unsigned long)(&vv->vbi_dmaq));
        vv->vbi_dmaq.dev              = dev;
 
        init_waitqueue_head(&vv->vbi_wq);

diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
index e034bcfcf757fd118d1caf9481ff1019d7b383fe..b3b29d4f36ed880f556246a152df98bbfb6c3e07 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/media/common/saa7146/saa7146_video.c
@@ -1201,9 +1201,8 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
        INIT_LIST_HEAD(&vv->video_dmaq.queue);
 
-       init_timer(&vv->video_dmaq.timeout);
-       vv->video_dmaq.timeout.function = saa7146_buffer_timeout;
-       vv->video_dmaq.timeout.data     = (unsigned long)(&vv->video_dmaq);
+       setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout,
+                   (unsigned long)(&vv->video_dmaq));
        vv->video_dmaq.dev              = dev;
 
        /* set some default values */