[media] imon: 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>

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 89823d24a38441cf7e3bcaef11b4f623eb78d01d..3489010601b57bbd396417f19b268b635183e103 100644 (file)
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2412,9 +2412,8 @@ static struct imon_context *imon_init_intf1(struct usb_interface *intf,
        mutex_lock(&ictx->lock);
 
        if (ictx->display_type == IMON_DISPLAY_TYPE_VGA) {
-               init_timer(&ictx->ttimer);
-               ictx->ttimer.data = (unsigned long)ictx;
-               ictx->ttimer.function = imon_touch_display_timeout;
+               setup_timer(&ictx->ttimer, imon_touch_display_timeout,
+                           (unsigned long)ictx);
        }
 
        ictx->usbdev_intf1 = usb_get_dev(interface_to_usbdev(intf));