[media] saa7134: 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/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 578e03f8c04157bb24c1346bd1eb870c7292ef31..7414878af9e08a73665f291a60cbcb2e145bcb01 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -223,9 +223,8 @@ int saa7134_ts_init1(struct saa7134_dev *dev)
        dev->ts.nr_packets = ts_nr_packets;
 
        INIT_LIST_HEAD(&dev->ts_q.queue);
-       init_timer(&dev->ts_q.timeout);
-       dev->ts_q.timeout.function = saa7134_buffer_timeout;
-       dev->ts_q.timeout.data     = (unsigned long)(&dev->ts_q);
+       setup_timer(&dev->ts_q.timeout, saa7134_buffer_timeout,
+                   (unsigned long)(&dev->ts_q));
        dev->ts_q.dev              = dev;
        dev->ts_q.need_two         = 1;
        dev->ts_started            = 0;

diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index 46193370e41a41c872c76de6f25a56c9c586757a..bcad9b2d9bb390a30215939473b1d0211c52bb05 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -181,9 +181,8 @@ struct vb2_ops saa7134_vbi_qops = {
 int saa7134_vbi_init1(struct saa7134_dev *dev)
 {
        INIT_LIST_HEAD(&dev->vbi_q.queue);
-       init_timer(&dev->vbi_q.timeout);
-       dev->vbi_q.timeout.function = saa7134_buffer_timeout;
-       dev->vbi_q.timeout.data     = (unsigned long)(&dev->vbi_q);
+       setup_timer(&dev->vbi_q.timeout, saa7134_buffer_timeout,
+                   (unsigned long)(&dev->vbi_q));
        dev->vbi_q.dev              = dev;
 
        if (vbibufs < 2)

diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 4b1c4327f1127418ada7260d739070bca3dd3b24..51d42bbf969e285732e967755c3a015cca451a04 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2145,9 +2145,8 @@ int saa7134_video_init1(struct saa7134_dev *dev)
        dev->automute       = 0;
 
        INIT_LIST_HEAD(&dev->video_q.queue);
-       init_timer(&dev->video_q.timeout);
-       dev->video_q.timeout.function = saa7134_buffer_timeout;
-       dev->video_q.timeout.data     = (unsigned long)(&dev->video_q);
+       setup_timer(&dev->video_q.timeout, saa7134_buffer_timeout,
+                   (unsigned long)(&dev->video_q));
        dev->video_q.dev              = dev;
        dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
        dev->width    = 720;