summaryrefslogtreecommitdiff
path: root/drivers/media/pci/ivtv
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-09 04:34:01 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-10 20:50:15 +0300
commitf563607ae97d8b1a1f8fff6f975e5ed23ae9a70e (patch)
tree88290ad49f56f5484e057f8bb0543d757432ea3e /drivers/media/pci/ivtv
parentd720e055945ca039939b2a857b7c54d22de9dff7 (diff)
downloadlinux-f563607ae97d8b1a1f8fff6f975e5ed23ae9a70e.tar.xz
[media] ivtv: use setup_timer
Use setup_timer() instead of init_timer() to simplify the code. Signed-off-by: Geliang Tang <geliangtang@gmail.com> 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')
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index a71a03e22385..e8fa99b6c7b4 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;