summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/imon.c
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-08 22:34:08 -0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-10 14:56:57 -0300
commitbd742c6586401de18d2009dc891cb75ab7fdd795 (patch)
tree3c106343dcfce8d01c22df9497aa908bc0bf35fe /drivers/media/rc/imon.c
parent729dee30ddba1b3d110c5bc328f66c47babccf4e (diff)
downloadlinux-bd742c6586401de18d2009dc891cb75ab7fdd795.tar.bz2
[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>
Diffstat (limited to 'drivers/media/rc/imon.c')
-rw-r--r--drivers/media/rc/imon.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 89823d24a384..3489010601b5 100644
--- 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));