Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / cx88 / cx88-input.c

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 8683d104de72a4113587bff03440d38749ce048b..ec05312a9b6222f2ba627fde070777d17ef82188 100644 (file)
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -48,8 +48,7 @@ struct cx88_IR {
 
        /* poll external decoder */
        int polling;
-       struct work_struct work;
-       struct timer_list timer;
+       struct delayed_work work;
        u32 gpio_addr;
        u32 last_gpio;
        u32 mask_keycode;
@@ -143,27 +142,19 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
        }
 }
 
-static void ir_timer(unsigned long data)
-{
-       struct cx88_IR *ir = (struct cx88_IR *)data;
-
-       schedule_work(&ir->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.work);
 
        cx88_ir_handle_key(ir);
-       mod_timer(&ir->timer, jiffies + msecs_to_jiffies(ir->polling));
+       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) {
-               setup_timer(&ir->timer, ir_timer, (unsigned long)ir);
-               INIT_WORK(&ir->work, cx88_ir_work);
-               schedule_work(&ir->work);
+               INIT_DELAYED_WORK(&ir->work, cx88_ir_work);
+               schedule_delayed_work(&ir->work, 0);
        }
        if (ir->sampling) {
                core->pci_irqmask |= PCI_INT_IR_SMPINT;
@@ -179,10 +170,8 @@ void cx88_ir_stop(struct cx88_core *core, struct cx88_IR *ir)
                core->pci_irqmask &= ~PCI_INT_IR_SMPINT;
        }
 
-       if (ir->polling) {
-               del_timer_sync(&ir->timer);
-               flush_scheduled_work();
-       }
+       if (ir->polling)
+               cancel_delayed_work_sync(&ir->work);
 }
 
 /* ---------------------------------------------------------------------- */
@@ -226,6 +215,8 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
        case CX88_BOARD_HAUPPAUGE_HVR3000:
        case CX88_BOARD_HAUPPAUGE_HVR4000:
        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+       case CX88_BOARD_PCHDTV_HD3000:
+       case CX88_BOARD_PCHDTV_HD5500:
                ir_codes = ir_codes_hauppauge_new;
                ir_type = IR_TYPE_RC5;
                ir->sampling = 1;
@@ -466,6 +457,8 @@ void cx88_ir_irq(struct cx88_core *core)
        case CX88_BOARD_HAUPPAUGE_HVR3000:
        case CX88_BOARD_HAUPPAUGE_HVR4000:
        case CX88_BOARD_HAUPPAUGE_HVR4000LITE:
+       case CX88_BOARD_PCHDTV_HD3000:
+       case CX88_BOARD_PCHDTV_HD5500:
                ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                ir_dprintk("biphase decoded: %x\n", ircode);
                /*