summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGeliang Tang <geliangtang@gmail.com>2017-04-09 03:34:03 +0200
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-04-10 19:55:37 +0200
commitb4e80f3c45c061bcf67b0ff90fd0bd4ce3b7a8b4 (patch)
tree64580f5555e6d85b7745236aac8127e90e67d978 /drivers/media
parent[media] netup_unidvb: use setup_timer (diff)
downloadlinux-b4e80f3c45c061bcf67b0ff90fd0bd4ce3b7a8b4.tar.xz
linux-b4e80f3c45c061bcf67b0ff90fd0bd4ce3b7a8b4.zip
[media] av7110: 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')
-rw-r--r--drivers/media/pci/ttpci/av7110_ir.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/media/pci/ttpci/av7110_ir.c b/drivers/media/pci/ttpci/av7110_ir.c
index 10e28f067b45..ca05198de2c2 100644
--- a/drivers/media/pci/ttpci/av7110_ir.c
+++ b/drivers/media/pci/ttpci/av7110_ir.c
@@ -333,9 +333,8 @@ int av7110_ir_init(struct av7110 *av7110)
av_list[av_cnt++] = av7110;
av7110_check_ir_config(av7110, true);
- init_timer(&av7110->ir.keyup_timer);
- av7110->ir.keyup_timer.function = av7110_emit_keyup;
- av7110->ir.keyup_timer.data = (unsigned long) &av7110->ir;
+ setup_timer(&av7110->ir.keyup_timer, av7110_emit_keyup,
+ (unsigned long)&av7110->ir);
input_dev = input_allocate_device();
if (!input_dev)