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

Signed-off-by: Geliang Tang <geliangt...@gmail.com>
---
 drivers/media/platform/fsl-viu.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index ae8c6b3..97e164b 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1466,9 +1466,8 @@ 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);
 
-       viu_dev->vidq.timeout.function = viu_vid_timeout;
-       viu_dev->vidq.timeout.data     = (unsigned long)viu_dev;
-       init_timer(&viu_dev->vidq.timeout);
+       setup_timer(&viu_dev->vidq.timeout, viu_vid_timeout,
+                   (unsigned long)viu_dev);
        viu_dev->std = V4L2_STD_NTSC_M;
        viu_dev->first = 1;
 
-- 
2.9.3

Reply via email to