treewide: setup_timer() -> timer_setup() (2 field)

[mirror_ubuntu-bionic-kernel.git] / drivers / media / platform / fsl-viu.c

diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index fb43025df57379834a99e1be3d6124c827cd91a9..dba21215dc845df2aec191127bf59502bdc903cd 100644 (file)
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -339,9 +339,9 @@ static int restart_video_queue(struct viu_dmaqueue *vidq)
        }
 }
 
-static void viu_vid_timeout(unsigned long data)
+static void viu_vid_timeout(struct timer_list *t)
 {
-       struct viu_dev *dev = (struct viu_dev *)data;
+       struct viu_dev *dev = from_timer(dev, t, vidq.timeout);
        struct viu_buf *buf;
        struct viu_dmaqueue *vidq = &dev->vidq;
 
@@ -1466,8 +1466,7 @@ static int viu_of_probe(struct platform_device *op)
        viu_dev->decoder = v4l2_i2c_new_subdev(&viu_dev->v4l2_dev, ad,
                        "saa7113", VIU_VIDEO_DECODER_ADDR, NULL);
 
-       setup_timer(&viu_dev->vidq.timeout, viu_vid_timeout,
-                   (unsigned long)viu_dev);
+       timer_setup(&viu_dev->vidq.timeout, viu_vid_timeout, 0);
        viu_dev->std = V4L2_STD_NTSC_M;
        viu_dev->first = 1;