[PATCH 06/12] [media] netup_unidvb: use setup_timer

[Geliang Tang]

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

Signed-off-by: Geliang Tang 
---
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c 
b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 191bd82..983 100644
--- 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(>lock);
INIT_WORK(>work, netup_unidvb_dma_worker);
INIT_LIST_HEAD(>free_buffers);
-   dma->timeout.function = netup_unidvb_dma_timeout;
-   dma->timeout.data = (unsigned long)dma;
-   init_timer(>timeout);
+   setup_timer(>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 +
-- 
2.9.3

[PATCH 06/12] [media] netup_unidvb: use setup_timer

[Geliang Tang]

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

Signed-off-by: Geliang Tang 
---
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c 
b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 191bd82..983 100644
--- 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(>lock);
INIT_WORK(>work, netup_unidvb_dma_worker);
INIT_LIST_HEAD(>free_buffers);
-   dma->timeout.function = netup_unidvb_dma_timeout;
-   dma->timeout.data = (unsigned long)dma;
-   init_timer(>timeout);
+   setup_timer(>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 +
-- 
2.9.3