Merge tag 'media/v4.15-1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mcheh...

[mirror_ubuntu-focal-kernel.git] / drivers / media / pci / tw686x / tw686x-core.c

diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c
index b762e5f0ba1d55c5916b43c9f9e070689151f61b..7fb3f07bf02215dd90d7ae5bcc27550fb0526061 100644 (file)
--- a/drivers/media/pci/tw686x/tw686x-core.c
+++ b/drivers/media/pci/tw686x/tw686x-core.c
@@ -126,9 +126,9 @@ void tw686x_enable_channel(struct tw686x_dev *dev, unsigned int channel)
  * channels "too fast" which makes some TW686x devices very
  * angry and freeze the CPU (see note 1).
  */
-static void tw686x_dma_delay(unsigned long data)
+static void tw686x_dma_delay(struct timer_list *t)
 {
-       struct tw686x_dev *dev = (struct tw686x_dev *)data;
+       struct tw686x_dev *dev = from_timer(dev, t, dma_delay_timer);
        unsigned long flags;
 
        spin_lock_irqsave(&dev->lock, flags);
@@ -325,8 +325,7 @@ static int tw686x_probe(struct pci_dev *pci_dev,
                goto iounmap;
        }
 
-       setup_timer(&dev->dma_delay_timer,
-                   tw686x_dma_delay, (unsigned long) dev);
+       timer_setup(&dev->dma_delay_timer, tw686x_dma_delay, 0);
 
        /*
         * This must be set right before initializing v4l2_dev.