diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:06:14 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-13 18:06:14 -0300 |
commit | 9840199e825a71000f4d87e61380867fe3dc7f80 (patch) | |
tree | aaee9b6e6b95130e5409343389d9f65dd9867094 /linux/drivers/media/video/cx88/cx88-input.c | |
parent | f689c3bd615386cf4c5238d1b4de1aaf4b58ce69 (diff) | |
parent | c3ce9d2f22c72aa484146a24d87be98d1a29ab9f (diff) | |
download | mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.gz mediapointer-dvb-s2-9840199e825a71000f4d87e61380867fe3dc7f80.tar.bz2 |
merge: http://linuxtv.org/hg/~hgoede/libv4l
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-input.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-input.c | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-input.c b/linux/drivers/media/video/cx88/cx88-input.c index f247e5f45..8a2e631b7 100644 --- a/linux/drivers/media/video/cx88/cx88-input.c +++ b/linux/drivers/media/video/cx88/cx88-input.c @@ -49,12 +49,7 @@ struct cx88_IR { /* poll external decoder */ int polling; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - struct work_struct work; - struct timer_list timer; -#else struct delayed_work work; -#endif u32 gpio_addr; u32 last_gpio; u32 mask_keycode; @@ -149,13 +144,6 @@ static void cx88_ir_handle_key(struct cx88_IR *ir) } #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) -static void ir_timer(unsigned long data) -{ - struct cx88_IR *ir = (struct cx88_IR *)data; - - schedule_work(&ir->work); -} - static void cx88_ir_work(void *data) #else static void cx88_ir_work(struct work_struct *work) @@ -164,30 +152,22 @@ static void cx88_ir_work(struct work_struct *work) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) struct cx88_IR *ir = data; #else - struct delayed_work *dwork = container_of(work, struct delayed_work, - work); - struct cx88_IR *ir = container_of(dwork, struct cx88_IR, work); + struct cx88_IR *ir = container_of(work, struct cx88_IR, work.work); #endif cx88_ir_handle_key(ir); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling)); -#else - schedule_delayed_work(dwork, msecs_to_jiffies(ir->polling)); -#endif + schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling)); } void cx88_ir_start(struct cx88_core *core, struct cx88_IR *ir) { if (ir->polling) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - setup_timer(&ir->timer, ir_timer, (unsigned long)ir); - INIT_WORK(&ir->work, cx88_ir_work, ir); - schedule_work(&ir->work); + INIT_DELAYED_WORK(&ir->work, cx88_ir_work, ir); #else INIT_DELAYED_WORK(&ir->work, cx88_ir_work); - schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling)); #endif + schedule_delayed_work(&ir->work, 0); } if (ir->sampling) { core->pci_irqmask |= PCI_INT_IR_SMPINT; @@ -203,14 +183,8 @@ void cx88_ir_stop(struct cx88_core *core, struct cx88_IR *ir) core->pci_irqmask &= ~PCI_INT_IR_SMPINT; } - if (ir->polling) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - del_timer_sync(&ir->timer); - flush_scheduled_work(); -#else + if (ir->polling) cancel_delayed_work_sync(&ir->work); -#endif - } } /* ---------------------------------------------------------------------- */ |