summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-irq.h
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2017-10-24 17:22:42 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-10-31 12:24:43 +0100
commit162e6376ac58440beb6a2d2ee294f5d88ea58dd1 (patch)
tree0802a11fe15c0531313d5374a54017fb5dfbeeab /drivers/media/pci/ivtv/ivtv-irq.h
parentmedia: tegra-cec: fix messy probe() cleanup (diff)
downloadlinux-162e6376ac58440beb6a2d2ee294f5d88ea58dd1.tar.xz
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/ivtv/ivtv-irq.h')
-rw-r--r--drivers/media/pci/ivtv/ivtv-irq.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-irq.h b/drivers/media/pci/ivtv/ivtv-irq.h
index 1e84433737cc..bcab5f07d37f 100644
--- a/drivers/media/pci/ivtv/ivtv-irq.h
+++ b/drivers/media/pci/ivtv/ivtv-irq.h
@@ -48,6 +48,6 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id);
void ivtv_irq_work_handler(struct kthread_work *work);
void ivtv_dma_stream_dec_prepare(struct ivtv_stream *s, u32 offset, int lock);
-void ivtv_unfinished_dma(unsigned long arg);
+void ivtv_unfinished_dma(struct timer_list *t);
#endif