[media] netup_unidvb: 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>

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 191bd8299dc398896206a65885d21f343531550c..9444483fb9422377b08b28ff06a740f54e799bd4 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -663,9 +663,8 @@ static int netup_unidvb_dma_init(struct netup_unidvb_dev *ndev, int num)
        spin_lock_init(&dma->lock);
        INIT_WORK(&dma->work, netup_unidvb_dma_worker);
        INIT_LIST_HEAD(&dma->free_buffers);
-       dma->timeout.function = netup_unidvb_dma_timeout;
-       dma->timeout.data = (unsigned long)dma;
-       init_timer(&dma->timeout);
+       setup_timer(&dma->timeout, netup_unidvb_dma_timeout,
+                   (unsigned long)dma);
        dma->ring_buffer_size = ndev->dma_size / 2;
        dma->addr_virt = ndev->dma_virt + dma->ring_buffer_size * num;
        dma->addr_phys = (dma_addr_t)((u64)ndev->dma_phys +