diff options
| author | Kees Cook | 2017-10-24 17:22:42 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2017-10-31 12:24:43 +0100 |
| commit | 162e6376ac58440beb6a2d2ee294f5d88ea58dd1 (patch) | |
| tree | 0802a11fe15c0531313d5374a54017fb5dfbeeab /drivers/media/pci/cx18/cx18-streams.c | |
| parent | media: tegra-cec: fix messy probe() cleanup (diff) | |
| download | kernel-qcow2-linux-162e6376ac58440beb6a2d2ee294f5d88ea58dd1.tar.gz kernel-qcow2-linux-162e6376ac58440beb6a2d2ee294f5d88ea58dd1.tar.xz kernel-qcow2-linux-162e6376ac58440beb6a2d2ee294f5d88ea58dd1.zip | |
media: pci: 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: Andy Walls <awalls@md.metrocast.net>
Cc: Sergey Kozlov <serjk@netup.ru>
Cc: Abylay Ospan <aospan@netup.ru>
Cc: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Cc: Arvind Yadav <arvind.yadav.cs@gmail.com>
Cc: Geliang Tang <geliangtang@gmail.com>
Cc: Sean Young <sean@mess.org>
Cc: "Pali Rohár" <pali.rohar@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
[hans.verkuil@cisco.com: dropped pci/ttpci/av7110_ir.c patch chunk]
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/pci/cx18/cx18-streams.c')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-streams.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c index 8385411af641..f35f78d66985 100644 --- a/drivers/media/pci/cx18/cx18-streams.c +++ b/drivers/media/pci/cx18/cx18-streams.c @@ -282,7 +282,7 @@ static void cx18_stream_init(struct cx18 *cx, int type) INIT_WORK(&s->out_work_order, cx18_out_work_handler); INIT_LIST_HEAD(&s->vb_capture); - setup_timer(&s->vb_timeout, cx18_vb_timeout, (unsigned long)s); + timer_setup(&s->vb_timeout, cx18_vb_timeout, 0); spin_lock_init(&s->vb_lock); if (type == CX18_ENC_STREAM_TYPE_YUV) { spin_lock_init(&s->vbuf_q_lock); |