media: saa7134: 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.

Cc: Geliang Tang <geliangtang@gmail.com>
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/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 7976c5a12ca85af06235f458bea1e613bf571099..9e76de2411ae6c77ac8b5c20097b05c9e12f7532 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -338,9 +338,9 @@ void saa7134_buffer_next(struct saa7134_dev *dev,
        }
 }
 
-void saa7134_buffer_timeout(unsigned long data)
+void saa7134_buffer_timeout(struct timer_list *t)
 {
-       struct saa7134_dmaqueue *q = (struct saa7134_dmaqueue *)data;
+       struct saa7134_dmaqueue *q = from_timer(q, t, timeout);
        struct saa7134_dev *dev = q->dev;
        unsigned long flags;
 
@@ -378,7 +378,7 @@ void saa7134_stop_streaming(struct saa7134_dev *dev, struct saa7134_dmaqueue *q)
                }
        }
        spin_unlock_irqrestore(&dev->slock, flags);
-       saa7134_buffer_timeout((unsigned long)q); /* also calls del_timer(&q->timeout) */
+       saa7134_buffer_timeout(&q->timeout); /* also calls del_timer(&q->timeout) */
 }
 EXPORT_SYMBOL_GPL(saa7134_stop_streaming);
 

diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 9337e46155193728dea3b8e970f37c6c15295d53..2d5abeddc07950eb6216d1b1f52c69f68c85dc5c 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -447,10 +447,10 @@ void saa7134_input_irq(struct saa7134_dev *dev)
        }
 }
 
-static void saa7134_input_timer(unsigned long data)
+static void saa7134_input_timer(struct timer_list *t)
 {
-       struct saa7134_dev *dev = (struct saa7134_dev *)data;
-       struct saa7134_card_ir *ir = dev->remote;
+       struct saa7134_card_ir *ir = from_timer(ir, t, timer);
+       struct saa7134_dev *dev = ir->dev->priv;
 
        build_key(dev);
        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
@@ -507,8 +507,7 @@ static int __saa7134_ir_start(void *priv)
        ir->running = true;
 
        if (ir->polling) {
-               setup_timer(&ir->timer, saa7134_input_timer,
-                           (unsigned long)dev);
+               timer_setup(&ir->timer, saa7134_input_timer, 0);
                ir->timer.expires = jiffies + HZ;
                add_timer(&ir->timer);
        }

diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index 7414878af9e08a73665f291a60cbcb2e145bcb01..2be703617e29434cc06d0210287ef503fd4903f8 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -223,8 +223,7 @@ int saa7134_ts_init1(struct saa7134_dev *dev)
        dev->ts.nr_packets = ts_nr_packets;
 
        INIT_LIST_HEAD(&dev->ts_q.queue);
-       setup_timer(&dev->ts_q.timeout, saa7134_buffer_timeout,
-                   (unsigned long)(&dev->ts_q));
+       timer_setup(&dev->ts_q.timeout, saa7134_buffer_timeout, 0);
        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 07a397bb775dca438d1b66e673de221875b60701..57bea543c39ba38ba1c722099e226e8366ce0d0b 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -181,8 +181,7 @@ const struct vb2_ops saa7134_vbi_qops = {
 int saa7134_vbi_init1(struct saa7134_dev *dev)
 {
        INIT_LIST_HEAD(&dev->vbi_q.queue);
-       setup_timer(&dev->vbi_q.timeout, saa7134_buffer_timeout,
-                   (unsigned long)(&dev->vbi_q));
+       timer_setup(&dev->vbi_q.timeout, saa7134_buffer_timeout, 0);
        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 51d42bbf969e285732e967755c3a015cca451a04..82d2a24644e4afff78c36e07aec9ccf2d0cd218e 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2145,8 +2145,7 @@ int saa7134_video_init1(struct saa7134_dev *dev)
        dev->automute       = 0;
 
        INIT_LIST_HEAD(&dev->video_q.queue);
-       setup_timer(&dev->video_q.timeout, saa7134_buffer_timeout,
-                   (unsigned long)(&dev->video_q));
+       timer_setup(&dev->video_q.timeout, saa7134_buffer_timeout, 0);
        dev->video_q.dev              = dev;
        dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
        dev->width    = 720;

diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 545f7ad8b16d6cfe220dce59923a4363140ca0d7..39c36e6aefbea20dba7f5fafd183d628e9b597b5 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -773,7 +773,7 @@ int saa7134_buffer_queue(struct saa7134_dev *dev, struct saa7134_dmaqueue *q,
 void saa7134_buffer_finish(struct saa7134_dev *dev, struct saa7134_dmaqueue *q,
                           unsigned int state);
 void saa7134_buffer_next(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
-void saa7134_buffer_timeout(unsigned long data);
+void saa7134_buffer_timeout(struct timer_list *t);
 void saa7134_stop_streaming(struct saa7134_dev *dev, struct saa7134_dmaqueue *q);
 
 int saa7134_set_dmabits(struct saa7134_dev *dev);