Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (126 commits)
  V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code
  V4L/DVB (5846): Clean up setting state and scheduling timeouts
  V4L/DVB (5844): ivtv: add high volume debugging flag
  V4L/DVB (5843): ivtv: fix missing signal_pending check.
  V4L/DVB (5842): ivtv: Add locking to ensure stream setup is atomic.
  V4L/DVB (5841): tveeprom: add support for Philips FQ1216LME MK3 tuner.
  V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay
  V4L/DVB (5838): dvb-core: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
  V4L/DVB (5837): stv0299: Fix signedness warning (gcc 4.1.1, kernel 2.6.22)
  V4L/DVB (5836): dvb-ttpci: re-initialize aspect ratio and pan scan after arm crash
  V4L/DVB (5835): saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
  V4L/DVB (5834): dvb-core: fix signedness warnings and const stripping
  V4L/DVB (5832): ir-common: optimize bit extract function
  V4L/DVB (5831): stradis: use ARRAY_SIZE
  V4L/DVB (5829): Firmware extract and loading for opera dvb-usb update
  V4L/DVB (5828): Kconfig: Added GemTek USB radio and removed experimental dependency.
  V4L/DVB (5826): Usbvision: video mux cleanup
  V4L/DVB (5825): Alter the tuner type for the WinTV USB UK PAL model.
  V4L/DVB (5824): Usbvision: Hauppauge WinTV USB SECAM_L fix
  V4L/DVB (5821): Saa7134: add remote control support for LifeView FlyDVB-S LR300
  ...

1 files changed, 13 insertions, 12 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 8136673fe9e8..f5d4a565346e 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -74,7 +74,8 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
         /* read gpio value */
         gpio = cx_read(ir->gpio_addr);
-        if (core->board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {
+        switch (core->board) {
+        case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
                 /* This board apparently uses a combination of 2 GPIO
                    to represent the keys. Additionally, the second GPIO
                    can be used for parity.
@@ -90,9 +91,14 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
                 auxgpio = cx_read(MO_GP1_IO);
                 /* Take out the parity part */
                 gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
-        } else
+                break;
+        case CX88_BOARD_WINFAST_DTV1000:
+                gpio = (gpio & 0x6ff) | ((cx_read(MO_GP1_IO) << 8) & 0x900);
                 auxgpio = gpio;
-
+                break;
+        default:
+                auxgpio = gpio;
+        }
         if (ir->polling) {
                 if (ir->last_gpio == auxgpio)
                         return;
@@ -148,20 +154,16 @@ static void ir_timer(unsigned long data)
 static void cx88_ir_work(struct work_struct *work)
 {
         struct cx88_IR *ir = container_of(work, struct cx88_IR, work);
-        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);
                 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);
         }
         if (ir->sampling) {
@@ -222,7 +224,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
-        case CX88_BOARD_HAUPPAUGE_HVR1300:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
                 ir_codes = ir_codes_hauppauge_new;
                 ir_type = IR_TYPE_RC5;
@@ -236,6 +237,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir->polling = 50; /* ms */
                 break;
         case CX88_BOARD_WINFAST2000XP_EXPERT:
+        case CX88_BOARD_WINFAST_DTV1000:
                 ir_codes = ir_codes_winfast;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0x8f8;
@@ -328,7 +330,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 input_dev->id.vendor = pci->vendor;
                 input_dev->id.product = pci->device;
         }
-        input_dev->cdev.dev = &pci->dev;
+        input_dev->dev.parent = &pci->dev;
         /* record handles to ourself */
         ir->core = core;
         core->ir = ir;
@@ -442,7 +444,6 @@ void cx88_ir_irq(struct cx88_core *core)
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
-        case CX88_BOARD_HAUPPAUGE_HVR1300:
         case CX88_BOARD_HAUPPAUGE_HVR3000:
                 ircode = ir_decode_biphase(ir->samples, ir->scount, 5, 7);
                 ir_dprintk("biphase decoded: %x\n", ircode);