diff options
| author | Kees Cook <keescook@chromium.org> | 2017-10-16 19:10:42 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-10-31 06:40:08 -0400 |
| commit | 12a83612ed23fccafe168828cafcce514f02e74d (patch) | |
| tree | a4d5422b870ed3b2759f21077fcd5fe23baea2f8 /drivers/media/common/saa7146/saa7146_fops.c | |
| parent | a88cd60fc94e7e04e61adeb1c6f6ba16031913f8 (diff) | |
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>
Diffstat (limited to 'drivers/media/common/saa7146/saa7146_fops.c')
| -rw-r--r-- | drivers/media/common/saa7146/saa7146_fops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c index c4664f0da874..8c87d6837c49 100644 --- 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; |