diff options
| author |   Geliang Tang <geliangtang@gmail.com> | 2017-04-08 22:34:02 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-04-10 14:50:50 -0300 |
| commit | 20bdb04d9582249309d7b99a4c38c21d591bc8bc (patch) | |
| tree | fb0f4cbaf101f1f5f3a8726582ee15de9e966975 /drivers/media | |
| parent | [media] ivtv: use setup_timer (diff) | |
| download | linux-dev-20bdb04d9582249309d7b99a4c38c21d591bc8bc.tar.xz linux-dev-20bdb04d9582249309d7b99a4c38c21d591bc8bc.zip | |
[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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 5 |
1 files 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 191bd8299dc3..9444483fb942 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(&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 + |