lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5683): V4L: cx88 - switch to using msecs_to_jiffies()

Browse Source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Dmitry Torokhov
2007-05-21 11:48:11 -03:00
committed by Mauro Carvalho Chehab
parent b4ba788425
commit 749823a06e
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/video/cx88/cx88-input.c
View File

@@ -148,20 +148,16 @@ static void ir_timer(unsigned long data)
static void cx88_ir_work(struct work_struct *work) static void cx88_ir_work(struct work_struct *work)
{ {
struct cx88_IR *ir = container_of(work, struct cx88_IR, work); struct cx88_IR *ir = container_of(work, struct cx88_IR, work);
unsigned long timeout;
cx88_ir_handle_key(ir); cx88_ir_handle_key(ir);
timeout = jiffies + (ir->polling * HZ / 1000); mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
mod_timer(&ir->timer, timeout);
} }
static void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir) static void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir)
{ {
if (ir->polling) { if (ir->polling) {
setup_timer(&ir->timer, ir_timer, (unsigned long)ir);
INIT_WORK(&ir->work, cx88_ir_work); INIT_WORK(&ir->work, cx88_ir_work);
init_timer(&ir->timer);
ir->timer.function = ir_timer;
ir->timer.data = (unsigned long)ir;
schedule_work(&ir->work); schedule_work(&ir->work);
} }
if (ir->sampling) { if (ir->sampling) {