media: saa7146: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Signed-off-by: Kees Cook <keescook@chromium.org>
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_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index c4664f0da8746f35e4abb8f1df8f523f17959f4a..8c87d6837c49d10dd05a7317f9e181b3c8d060aa 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -163,9 +163,9 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
        }
 }
 
-void saa7146_buffer_timeout(unsigned long data)
+void saa7146_buffer_timeout(struct timer_list *t)
 {
-       struct saa7146_dmaqueue *q = (struct saa7146_dmaqueue*)data;
+       struct saa7146_dmaqueue *q = from_timer(q, t, timeout);
        struct saa7146_dev *dev = q->dev;
        unsigned long flags;
 

diff --git a/drivers/media/common/saa7146/saa7146_vbi.c b/drivers/media/common/saa7146/saa7146_vbi.c
index ae66c2325228d83a41d50a7d25d77efc519b69a3..7fa3147c2d7ef2fd42dd964fdff43c19d45b85e6 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_vbi.c
+++ b/drivers/media/common/saa7146/saa7146_vbi.c
@@ -366,8 +366,7 @@ static void vbi_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 
        INIT_LIST_HEAD(&vv->vbi_dmaq.queue);
 
-       setup_timer(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout,
-                   (unsigned long)(&vv->vbi_dmaq));
+       timer_setup(&vv->vbi_dmaq.timeout, saa7146_buffer_timeout, 0);
        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 51eeed830de496faf849b072ab2e5fc3d188ee5d..2b631eaa65b3dac434f74723af92c2400c396613 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/media/common/saa7146/saa7146_video.c
@@ -1201,8 +1201,7 @@ static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv)
 {
        INIT_LIST_HEAD(&vv->video_dmaq.queue);
 
-       setup_timer(&vv->video_dmaq.timeout, saa7146_buffer_timeout,
-                   (unsigned long)(&vv->video_dmaq));
+       timer_setup(&vv->video_dmaq.timeout, saa7146_buffer_timeout, 0);
        vv->video_dmaq.dev              = dev;
 
        /* set some default values */

diff --git a/include/media/drv-intf/saa7146_vv.h b/include/media/drv-intf/saa7146_vv.h
index 926c5b1452796f0da1f981e3ab50daa601a92603..17bbe3851d753b96450eb259b88830981f849f22 100644 (file)
--- a/include/media/drv-intf/saa7146_vv.h
+++ b/include/media/drv-intf/saa7146_vv.h
@@ -184,7 +184,7 @@ int saa7146_unregister_device(struct video_device *vid, struct saa7146_dev *dev)
 void saa7146_buffer_finish(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, int state);
 void saa7146_buffer_next(struct saa7146_dev *dev, struct saa7146_dmaqueue *q,int vbi);
 int saa7146_buffer_queue(struct saa7146_dev *dev, struct saa7146_dmaqueue *q, struct saa7146_buf *buf);
-void saa7146_buffer_timeout(unsigned long data);
+void saa7146_buffer_timeout(struct timer_list *t);
 void saa7146_dma_free(struct saa7146_dev* dev,struct videobuf_queue *q,
                                                struct saa7146_buf *buf);