[PATCH 05/12] [media] ivtv: use setup_timer

[Geliang Tang]

Use setup_timer() instead of init_timer() to simplify the code.

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 drivers/media/pci/ivtv/ivtv-driver.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/ivtv/ivtv-driver.c 
b/drivers/media/pci/ivtv/ivtv-driver.c
index a71a03e..e8fa99b 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -770,9 +770,8 @@ 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);
-       init_timer(&itv->dma_timer);
-       itv->dma_timer.function = ivtv_unfinished_dma;
-       itv->dma_timer.data = (unsigned long)itv;
+       setup_timer(&itv->dma_timer, ivtv_unfinished_dma,
+                   (unsigned long)itv);
 
        itv->cur_dma_stream = -1;
        itv->cur_pio_stream = -1;
-- 
2.9.3