media: pci: Convert timers to use timer_setup()

[linux.git] / drivers / media / pci / ivtv / ivtv-driver.c

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index 54dcac4b22297c7a0f4d084978805367148b1088..6b2ffdc96961f3fe8a1ccffe28c89bfa1cec11fa 100644 (file)
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -770,8 +770,7 @@ static int ivtv_init_struct1(struct ivtv *itv)
        init_waitqueue_head(&itv->event_waitq);
        init_waitqueue_head(&itv->vsync_waitq);
        init_waitqueue_head(&itv->dma_waitq);
-       setup_timer(&itv->dma_timer, ivtv_unfinished_dma,
-                   (unsigned long)itv);
+       timer_setup(&itv->dma_timer, ivtv_unfinished_dma, 0);
 
        itv->cur_dma_stream = -1;
        itv->cur_pio_stream = -1;