diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-21 11:48:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-21 11:48:11 -0300 |
| commit | 37019a7d11c6cd4a51e9766830f6ed25e3e709d8 (patch) | |
| tree | d718447d098d84350534df80e730a17d399f8fef | |
| parent | 40afb3b531b8e4eb61e48e01f536d02ec4182fa2 (diff) | |
| download | mediapointer-dvb-s2-37019a7d11c6cd4a51e9766830f6ed25e3e709d8.tar.gz mediapointer-dvb-s2-37019a7d11c6cd4a51e9766830f6ed25e3e709d8.tar.bz2 | |
V4L: cx88 - switch to using msecs_to_jiffies()
From: Dmitry Torokhov <dtor@insightbb.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index 6c712ecdd..a2e34e901 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -157,24 +157,20 @@ static void cx88_ir_work(struct work_struct *work) #else struct cx88_IR *ir = container_of(work, struct cx88_IR, work); #endif - unsigned long timeout; cx88_ir_handle_key(ir); - timeout = jiffies + (ir->polling * HZ / 1000); - mod_timer(&ir->timer, timeout); + mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling)); } static void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir) { if (ir->polling) { + setup_timer(&ir->timer, ir_timer, (unsigned long)ir); #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) INIT_WORK(&ir->work, cx88_ir_work, ir); #else INIT_WORK(&ir->work, cx88_ir_work); #endif - init_timer(&ir->timer); - ir->timer.function = ir_timer; - ir->timer.data = (unsigned long)ir; schedule_work(&ir->work); } if (ir->sampling) { |