Skip to contentSkip to conversation

media: serial_ir: Convert timers to use timer_setup()

PATCH New Kees Cook 1 participant 1 message Oct 5, 2017

Subsystems (3)
Media (V4L/DVB) RC-core / lirc framework Serial IR receiver
lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 media: serial_ir: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly.

Cc Sean Young <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc [email protected]
Cc Thomas Gleixner <[email protected]>
Signed-off-by Kees Cook <[email protected]>

---
This requires commit 686fef928bba ("timer: Prepare to change timer callback argument type") in v4.14-rc3, but should be otherwise stand-alone.

---
 drivers/media/rc/serial_ir.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/media/rc/serial_ir.c +2 -3
index 8b66926bc16a..8bf5637b3a69 100644
@@ -470,7 +470,7 @@ static int hardware_init_port(void)
 	return 0;
 }
 
-static void serial_ir_timeout(unsigned long arg)
+static void serial_ir_timeout(struct timer_list *unused)
 {
 	DEFINE_IR_RAW_EVENT(ev);
 

@@ -540,8 +540,7 @@ static int serial_ir_probe(struct platform_device *dev)
 
 	serial_ir.rcdev = rcdev;
 
-	setup_timer(&serial_ir.timeout_timer, serial_ir_timeout,
-		    (unsigned long)&serial_ir);
+	timer_setup(&serial_ir.timeout_timer, serial_ir_timeout, 0);
 
 	result = devm_request_irq(&dev->dev, irq, serial_ir_irq_handler,
 				  share_irq ? IRQF_SHARED : 0,
Signature · 6 lines
2.7.4


-- 
Kees Cook
Pixel Security