Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "This series include:
   - a new Remote Controller driver for ST SoC with the corresponding DT
     bindings
   - a new frontend (cx24117)
   - a new I2C camera flash driver (lm3560)
   - a new mem2mem driver for TI SoC (ti-vpe)
   - support for Raphael r828d added to r820t driver
   - some improvements on buffer allocation at VB2 core
   - usual driver fixes and improvements

  PS this time, we have a smaller number of patches.  While it is hard
  to pinpoint to the reasons, I believe that it is mainly due to:

   1) there are several patch series ready, but depending on DT review.
      I decided to grant some extra time for DT maintainers to look on
      it, as they're expecting to have more time with the changes agreed
      during ARM mini-summit and KS.  If they can't review in time for
      3.14, I'll review myself and apply for the next merge window.

   2) I suspect that having both LinuxCon EU and LinuxCon NA happening
      during the same merge window affected the development
      productivity, as several core media developers participated on
      both events"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (151 commits)
  [media] media: st-rc: Add ST remote control driver
  [media] gpio-ir-recv: Include linux/of.h header
  [media] tvp7002: Include linux/of.h header
  [media] tvp514x: Include linux/of.h header
  [media] ths8200: Include linux/of.h header
  [media] adv7343: Include linux/of.h header
  [media] v4l: Fix typo in v4l2_subdev_get_try_crop()
  [media] media: i2c: add driver for dual LED Flash, lm3560
  [media] rtl28xxu: add 15f4:0131 Astrometa DVB-T2
  [media] rtl28xxu: add RTL2832P + R828D support
  [media] rtl2832: add new tuner R828D
  [media] r820t: add support for R828D
  [media] media/i2c: ths8200: fix build failure with gcc 4.5.4
  [media] Add support for KWorld UB435-Q V2
  [media] staging/media: fix msi3101 build errors
  [media] ddbridge: Remove casting the return value which is a void pointer
  [media] ngene: Remove casting the return value which is a void pointer
  [media] dm1105: remove unneeded not-null test
  [media] sh_mobile_ceu_camera: remove deprecated IRQF_DISABLED
  [media] media: rcar_vin: Add preliminary r8a7790 support
  ...

30 files changed, 183 insertions, 109 deletions

diff --git a/drivers/media/pci/b2c2/flexcop-pci.c b/drivers/media/pci/b2c2/flexcop-pci.c
index 447afbd904a4..8b5e0b3a92a0 100644
--- a/drivers/media/pci/b2c2/flexcop-pci.c
+++ b/drivers/media/pci/b2c2/flexcop-pci.c
@@ -319,7 +319,6 @@ static int flexcop_pci_init(struct flexcop_pci *fc_pci)
 
 err_pci_iounmap:
         pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
-        pci_set_drvdata(fc_pci->pdev, NULL);
 err_pci_release_regions:
         pci_release_regions(fc_pci->pdev);
 err_pci_disable_device:
@@ -332,7 +331,6 @@ static void flexcop_pci_exit(struct flexcop_pci *fc_pci)
         if (fc_pci->init_state & FC_PCI_INIT) {
                 free_irq(fc_pci->pdev->irq, fc_pci);
                 pci_iounmap(fc_pci->pdev, fc_pci->io_mem);
-                pci_set_drvdata(fc_pci->pdev, NULL);
                 pci_release_regions(fc_pci->pdev);
                 pci_disable_device(fc_pci->pdev);
         }
diff --git a/drivers/media/pci/bt8xx/bt878.c b/drivers/media/pci/bt8xx/bt878.c
index 66eb0baab0e9..d0c281f41a0a 100644
--- a/drivers/media/pci/bt8xx/bt878.c
+++ b/drivers/media/pci/bt8xx/bt878.c
@@ -488,8 +488,7 @@ static int bt878_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
         btwrite(0, BT848_INT_MASK);
 
         result = request_irq(bt->irq, bt878_irq,
-                             IRQF_SHARED | IRQF_DISABLED, "bt878",
-                             (void *) bt);
+                             IRQF_SHARED, "bt878", (void *) bt);
         if (result == -EINVAL) {
                 printk(KERN_ERR "bt878(%d): Bad irq number or handler\n",
                        bt878_num);
@@ -563,7 +562,6 @@ static void bt878_remove(struct pci_dev *pci_dev)
         bt->shutdown = 1;
         bt878_mem_free(bt);
 
-        pci_set_drvdata(pci_dev, NULL);
         pci_disable_device(pci_dev);
         return;
 }
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index c6532de0eac7..a3b1ee9c00d7 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -4086,7 +4086,7 @@ static int bttv_probe(struct pci_dev *dev, const struct pci_device_id *pci_id)
         /* disable irqs, register irq handler */
         btwrite(0, BT848_INT_MASK);
         result = request_irq(btv->c.pci->irq, bttv_irq,
-            IRQF_SHARED | IRQF_DISABLED, btv->c.v4l2_dev.name, (void *)btv);
+            IRQF_SHARED, btv->c.v4l2_dev.name, (void *)btv);
         if (result < 0) {
                 pr_err("%d: can't get IRQ %d\n",
                        bttv_num, btv->c.pci->irq);
diff --git a/drivers/media/pci/cx18/cx18-driver.c b/drivers/media/pci/cx18/cx18-driver.c
index 004d8ace5019..ff7232023f56 100644
--- a/drivers/media/pci/cx18/cx18-driver.c
+++ b/drivers/media/pci/cx18/cx18-driver.c
@@ -1031,8 +1031,7 @@ static int cx18_probe(struct pci_dev *pci_dev,
 
         /* Register IRQ */
         retval = request_irq(cx->pci_dev->irq, cx18_irq_handler,
-                             IRQF_SHARED | IRQF_DISABLED,
-                             cx->v4l2_dev.name, (void *)cx);
+                             IRQF_SHARED, cx->v4l2_dev.name, (void *)cx);
         if (retval) {
                 CX18_ERR("Failed to register irq %d\n", retval);
                 goto free_i2c;
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig
index 5104c802f72f..d1dcb1d2e087 100644
--- a/drivers/media/pci/cx23885/Kconfig
+++ b/drivers/media/pci/cx23885/Kconfig
@@ -23,6 +23,7 @@ config VIDEO_CX23885
         select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 6a71a965e757..79f20c8c842e 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -223,6 +223,39 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "Leadtek Winfast PxDVR3200 H",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
+                .name           = "Leadtek Winfast PxPVR2200",
+                .porta          = CX23885_ANALOG_VIDEO,
+                .tuner_type     = TUNER_XC2028,
+                .tuner_addr     = 0x61,
+                .tuner_bus      = 1,
+                .input          = {{
+                        .type   = CX23885_VMUX_TELEVISION,
+                        .vmux   = CX25840_VIN2_CH1 |
+                                  CX25840_VIN5_CH2,
+                        .amux   = CX25840_AUDIO8,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_COMPOSITE1,
+                        .vmux   = CX25840_COMPOSITE1,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_SVIDEO,
+                        .vmux   = CX25840_SVIDEO_LUMA3 |
+                                  CX25840_SVIDEO_CHROMA4,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                }, {
+                        .type   = CX23885_VMUX_COMPONENT,
+                        .vmux   = CX25840_VIN7_CH1 |
+                                  CX25840_VIN6_CH2 |
+                                  CX25840_VIN8_CH3 |
+                                  CX25840_COMPONENT_ON,
+                        .amux   = CX25840_AUDIO7,
+                        .gpio0  = 0x704040,
+                } },
+        },
         [CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000] = {
                 .name           = "Leadtek Winfast PxDVR3200 H XC4000",
                 .porta          = CX23885_ANALOG_VIDEO,
@@ -259,6 +292,16 @@ struct cx23885_board cx23885_boards[] = {
                 .name           = "TurboSight TBS 6920",
                 .portb          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_TBS_6980] = {
+                .name           = "TurboSight TBS 6980",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_TBS_6981] = {
+                .name           = "TurboSight TBS 6981",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
         [CX23885_BOARD_TEVII_S470] = {
                 .name           = "TeVii S470",
                 .portb          = CX23885_MPEG_DVB,
@@ -688,6 +731,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
         }, {
                 .subvendor = 0x107d,
+                .subdevice = 0x6f21,
+                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
+        }, {
+                .subvendor = 0x107d,
                 .subdevice = 0x6f39,
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000,
         }, {
@@ -699,6 +746,14 @@ struct cx23885_subid cx23885_subids[] = {
                 .subdevice = 0x8888,
                 .card      = CX23885_BOARD_TBS_6920,
         }, {
+                .subvendor = 0x6980,
+                .subdevice = 0x8888,
+                .card      = CX23885_BOARD_TBS_6980,
+        }, {
+                .subvendor = 0x6981,
+                .subdevice = 0x8888,
+                .card      = CX23885_BOARD_TBS_6981,
+        }, {
                 .subvendor = 0xd470,
                 .subdevice = 0x9022,
                 .card      = CX23885_BOARD_TEVII_S470,
@@ -1023,6 +1078,35 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
                         dev->name, tv.model);
 }
 
+/* Some TBS cards require initing a chip using a bitbanged SPI attached
+   to the cx23885 gpio's. If this chip doesn't get init'ed the demod
+   doesn't respond to any command. */
+static void tbs_card_init(struct cx23885_dev *dev)
+{
+        int i;
+        const u8 buf[] = {
+                0xe0, 0x06, 0x66, 0x33, 0x65,
+                0x01, 0x17, 0x06, 0xde};
+
+        switch (dev->board) {
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                cx_set(GP0_IO, 0x00070007);
+                usleep_range(1000, 10000);
+                cx_clear(GP0_IO, 2);
+                usleep_range(1000, 10000);
+                for (i = 0; i < 9 * 8; i++) {
+                        cx_clear(GP0_IO, 7);
+                        usleep_range(1000, 10000);
+                        cx_set(GP0_IO,
+                                ((buf[i >> 3] >> (7 - (i & 7))) & 1) | 4);
+                        usleep_range(1000, 10000);
+                }
+                cx_set(GP0_IO, 7);
+                break;
+        }
+}
+
 int cx23885_tuner_callback(void *priv, int component, int command, int arg)
 {
         struct cx23885_tsport *port = priv;
@@ -1043,6 +1127,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1208,6 +1293,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x000f000f);
                 break;
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
@@ -1225,6 +1311,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x00040004);
                 break;
         case CX23885_BOARD_TBS_6920:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
         case CX23885_BOARD_PROF_8000:
                 cx_write(MC417_CTL, 0x00000036);
                 cx_write(MC417_OEN, 0x00001000);
@@ -1473,6 +1561,8 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 if (!enable_885_ir)
                         break;
                 dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1516,6 +1606,8 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
                 /* sd_ir is a duplicate pointer to the AV Core, just clear it */
                 dev->sd_ir = NULL;
@@ -1561,6 +1653,8 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 if (dev->sd_ir)
                         cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                 break;
@@ -1676,6 +1770,16 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                ts1->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                tbs_card_init(dev);
+                break;
         case CX23885_BOARD_MYGICA_X8506:
         case CX23885_BOARD_MAGICPRO_PROHDTVE2:
         case CX23885_BOARD_MYGICA_X8507:
@@ -1704,6 +1808,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
@@ -1733,6 +1838,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H_XC4000:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
@@ -1752,6 +1858,8 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_AVERMEDIA_HC81R:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 9f63d93239ec..edcd79db1e4e 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -2129,7 +2129,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
         }
 
         err = request_irq(pci_dev->irq, cx23885_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                          IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name, pci_dev->irq);
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 971e4ff1b87f..05492053b473 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -51,6 +51,7 @@
 #include "stv6110.h"
 #include "lnbh24.h"
 #include "cx24116.h"
+#include "cx24117.h"
 #include "cimax2.h"
 #include "lgs8gxx.h"
 #include "netup-eeprom.h"
@@ -461,6 +462,10 @@ static struct cx24116_config tbs_cx24116_config = {
         .demod_address = 0x55,
 };
 
+static struct cx24117_config tbs_cx24117_config = {
+        .demod_address = 0x55,
+};
+
 static struct ds3000_config tevii_ds3000_config = {
         .demod_address = 0x68,
 };
@@ -1044,6 +1049,25 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
 
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                i2c_bus = &dev->i2c_bus[1];
+
+                switch (port->nr) {
+                /* PORT B */
+                case 1:
+                        fe0->dvb.frontend = dvb_attach(cx24117_attach,
+                                        &tbs_cx24117_config,
+                                        &i2c_bus->i2c_adap);
+                        break;
+                /* PORT C */
+                case 2:
+                        fe0->dvb.frontend = dvb_attach(cx24117_attach,
+                                        &tbs_cx24117_config,
+                                        &i2c_bus->i2c_adap);
+                        break;
+                }
+                break;
         case CX23885_BOARD_TEVII_S470:
                 i2c_bus = &dev->i2c_bus[1];
 
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 7875dfbe09ff..8a49e7c9eddd 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -90,6 +90,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
         case CX23885_BOARD_TEVII_S470:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The only boards we handle right now.  However other boards
                  * using the CX2388x integrated IR controller should be similar
@@ -168,6 +170,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
                 break;
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
         case CX23885_BOARD_TEVII_S470:
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
                 /*
                  * The IR controller on this board only returns pulse widths.
                  * Any other mode setting will fail to set up the device.
@@ -298,6 +302,14 @@ int cx23885_input_init(struct cx23885_dev *dev)
                 /* A guess at the remote */
                 rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02;
                 break;
+        case CX23885_BOARD_TBS_6980:
+        case CX23885_BOARD_TBS_6981:
+                /* Integrated CX23885 IR controller */
+                driver_type = RC_DRIVER_IR_RAW;
+                allowed_protos = RC_BIT_ALL;
+                /* A guess at the remote */
+                rc_map = RC_MAP_TBS_NEC;
+                break;
         default:
                 return -ENODEV;
         }
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 161686832b20..7891f34157d1 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -1865,7 +1865,8 @@ int cx23885_video_register(struct cx23885_dev *dev)
 
                         v4l2_subdev_call(sd, tuner, s_type_addr, &tun_setup);
 
-                        if (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) {
+                        if ((dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXTV1200) ||
+                            (dev->board == CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200)) {
                                 struct xc2028_ctrl ctrl = {
                                         .fname = XC2028_DEFAULT_FIRMWARE,
                                         .max_len = 64
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 038caf53908b..0fa4048ab872 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -93,6 +93,9 @@
 #define CX23885_BOARD_PROF_8000                37
 #define CX23885_BOARD_HAUPPAUGE_HVR4400        38
 #define CX23885_BOARD_AVERMEDIA_HC81R          39
+#define CX23885_BOARD_TBS_6981                 40
+#define CX23885_BOARD_TBS_6980                 41
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 42
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
diff --git a/drivers/media/pci/cx25821/cx25821-cards.c b/drivers/media/pci/cx25821/cx25821-cards.c
index 3b409feb03d8..f2ebc989b303 100644
--- a/drivers/media/pci/cx25821/cx25821-cards.c
+++ b/drivers/media/pci/cx25821/cx25821-cards.c
@@ -45,5 +45,3 @@ struct cx25821_board cx25821_boards[] = {
         },
 
 };
-
-const unsigned int cx25821_bcount = ARRAY_SIZE(cx25821_boards);
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.c b/drivers/media/pci/cx25821/cx25821-medusa-video.c
index 22fa04415ccc..43bdfa4dfba1 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.c
@@ -438,7 +438,7 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
                 decoder_count = decoder_select + 1;
         } else {
                 decoder = 0;
-                decoder_count = _num_decoders;
+                decoder_count = dev->_max_num_decoders;
         }
 
         switch (width) {
@@ -506,8 +506,6 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
                 break;
         }
 
-        _display_field_cnt[decoder] = duration;
-
         /* update hardware */
         fld_cnt = cx25821_i2c_read(&dev->i2c_bus[0], disp_cnt_reg, &tmp);
 
@@ -667,8 +665,6 @@ int medusa_video_init(struct cx25821_dev *dev)
         int ret_val = 0;
         int i = 0;
 
-        _num_decoders = dev->_max_num_decoders;
-
         /* disable Auto source selection on all video decoders */
         value = cx25821_i2c_read(&dev->i2c_bus[0], MON_A_CTRL, &tmp);
         value &= 0xFFFFF0FF;
@@ -685,8 +681,14 @@ int medusa_video_init(struct cx25821_dev *dev)
         if (ret_val < 0)
                 goto error;
 
-        for (i = 0; i < _num_decoders; i++)
-                medusa_set_decoderduration(dev, i, _display_field_cnt[i]);
+        /*
+         * FIXME: due to a coding bug the duration was always 0. It's
+         * likely that it really should be something else, but due to the
+         * lack of documentation I have no idea what it should be. For
+         * now just fill in 0 as the duration.
+         */
+        for (i = 0; i < dev->_max_num_decoders; i++)
+                medusa_set_decoderduration(dev, i, 0);
 
         /* Select monitor as DENC A input, power up the DAC */
         value = cx25821_i2c_read(&dev->i2c_bus[0], DENC_AB_CTRL, &tmp);
@@ -717,7 +719,7 @@ int medusa_video_init(struct cx25821_dev *dev)
         /* Turn on all of the data out and control output pins. */
         value = cx25821_i2c_read(&dev->i2c_bus[0], PIN_OE_CTRL, &tmp);
         value &= 0xFEF0FE00;
-        if (_num_decoders == MAX_DECODERS) {
+        if (dev->_max_num_decoders == MAX_DECODERS) {
                 /*
                  * Note: The octal board does not support control pins(bit16-19)
                  * These bits are ignored in the octal board.
diff --git a/drivers/media/pci/cx25821/cx25821-medusa-video.h b/drivers/media/pci/cx25821/cx25821-medusa-video.h
index 6175e0961855..8bf602ff27b1 100644
--- a/drivers/media/pci/cx25821/cx25821-medusa-video.h
+++ b/drivers/media/pci/cx25821/cx25821-medusa-video.h
@@ -40,10 +40,4 @@
 #define CONTRAST_DEFAULT                5000
 #define HUE_DEFAULT                     5000
 
-unsigned short _num_decoders;
-unsigned short _num_cameras;
-
-unsigned int _video_standard;
-int _display_field_cnt[MAX_DECODERS];
-
 #endif
diff --git a/drivers/media/pci/cx25821/cx25821-video-upstream.c b/drivers/media/pci/cx25821/cx25821-video-upstream.c
index 88ffef410c50..1f43be0b04c8 100644
--- a/drivers/media/pci/cx25821/cx25821-video-upstream.c
+++ b/drivers/media/pci/cx25821/cx25821-video-upstream.c
@@ -159,10 +159,10 @@ static __le32 *cx25821_risc_field_upstream(struct cx25821_channel *chan, __le32
                  * For the upstream video channel, the risc engine will enable
                  * the FIFO. */
                 if (fifo_enable && line == 3) {
-                        *(rp++) = RISC_WRITECR;
-                        *(rp++) = sram_ch->dma_ctl;
-                        *(rp++) = FLD_VID_FIFO_EN;
-                        *(rp++) = 0x00000001;
+                        *(rp++) = cpu_to_le32(RISC_WRITECR);
+                        *(rp++) = cpu_to_le32(sram_ch->dma_ctl);
+                        *(rp++) = cpu_to_le32(FLD_VID_FIFO_EN);
+                        *(rp++) = cpu_to_le32(0x00000001);
                 }
         }
 
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index aba5b1c649e6..400eb1c42d3f 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -834,7 +834,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
 
         /* get irq */
         err = request_irq(chip->pci->irq, cx8801_irq,
-                          IRQF_SHARED | IRQF_DISABLED, chip->core->name, chip);
+                          IRQF_SHARED, chip->core->name, chip);
         if (err < 0) {
                 dprintk(0, "%s: can't get IRQ %d\n",
                        chip->core->name, chip->pci->irq);
@@ -935,8 +935,6 @@ static void cx88_audio_finidev(struct pci_dev *pci)
 
         snd_card_free((void *)card);
 
-        pci_set_drvdata(pci, NULL);
-
         devno--;
 }
 
@@ -951,27 +949,4 @@ static struct pci_driver cx88_audio_pci_driver = {
         .remove   = cx88_audio_finidev,
 };
 
-/****************************************************************************
-                                LINUX MODULE INIT
- ****************************************************************************/
-
-/*
- * module init
- */
-static int __init cx88_audio_init(void)
-{
-        printk(KERN_INFO "cx2388x alsa driver version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx88_audio_pci_driver);
-}
-
-/*
- * module remove
- */
-static void __exit cx88_audio_fini(void)
-{
-        pci_unregister_driver(&cx88_audio_pci_driver);
-}
-
-module_init(cx88_audio_init);
-module_exit(cx88_audio_fini);
+module_pci_driver(cx88_audio_pci_driver);
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 2d3507eb4897..74b7b8614c23 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -499,7 +499,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
 
         /* get irq */
         err = request_irq(dev->pci->irq, cx8802_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->core->name, dev);
+                          IRQF_SHARED, dev->core->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->core->name, dev->pci->irq);
@@ -520,7 +520,6 @@ static void cx8802_fini_common(struct cx8802_dev *dev)
 
         /* unregister stuff */
         free_irq(dev->pci->irq, dev);
-        pci_set_drvdata(dev->pci, NULL);
 
         /* free memory */
         btcx_riscmem_free(dev->pci,&dev->mpegq.stopper);
@@ -903,20 +902,8 @@ static struct pci_driver cx8802_pci_driver = {
         .remove   = cx8802_remove,
 };
 
-static int __init cx8802_init(void)
-{
-        printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx8802_pci_driver);
-}
-
-static void __exit cx8802_fini(void)
-{
-        pci_unregister_driver(&cx8802_pci_driver);
-}
+module_pci_driver(cx8802_pci_driver);
 
-module_init(cx8802_init);
-module_exit(cx8802_fini);
 EXPORT_SYMBOL(cx8802_buf_prepare);
 EXPORT_SYMBOL(cx8802_buf_queue);
 EXPORT_SYMBOL(cx8802_cancel_buffers);
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index ecf21d9f1f34..ed8cb9037b6f 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1738,7 +1738,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 
         /* get irq */
         err = request_irq(pci_dev->irq, cx8800_irq,
-                          IRQF_SHARED | IRQF_DISABLED, core->name, dev);
+                          IRQF_SHARED, core->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s/0: can't get IRQ %d\n",
                        core->name,pci_dev->irq);
@@ -1922,7 +1922,6 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
 
         free_irq(pci_dev->irq, dev);
         cx8800_unregister_video(dev);
-        pci_set_drvdata(pci_dev, NULL);
 
         /* free memory */
         btcx_riscmem_free(dev->pci,&dev->vidq.stopper);
@@ -2039,17 +2038,4 @@ static struct pci_driver cx8800_pci_driver = {
 #endif
 };
 
-static int __init cx8800_init(void)
-{
-        printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %s loaded\n",
-               CX88_VERSION);
-        return pci_register_driver(&cx8800_pci_driver);
-}
-
-static void __exit cx8800_fini(void)
-{
-        pci_unregister_driver(&cx8800_pci_driver);
-}
-
-module_init(cx8800_init);
-module_exit(cx8800_fini);
+module_pci_driver(cx8800_pci_driver);
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 36e34522b9a8..9375f30d9a81 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -1544,7 +1544,7 @@ static void ddb_unmap(struct ddb *dev)
 
 static void ddb_remove(struct pci_dev *pdev)
 {
-        struct ddb *dev = (struct ddb *) pci_get_drvdata(pdev);
+        struct ddb *dev = pci_get_drvdata(pdev);
 
         ddb_ports_detach(dev);
         ddb_i2c_release(dev);
diff --git a/drivers/media/pci/dm1105/dm1105.c b/drivers/media/pci/dm1105/dm1105.c
index ab797fe466d2..e60ac35fc10c 100644
--- a/drivers/media/pci/dm1105/dm1105.c
+++ b/drivers/media/pci/dm1105/dm1105.c
@@ -1178,7 +1178,6 @@ err_pci_release_regions:
 err_pci_disable_device:
         pci_disable_device(pdev);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(dev);
         return ret;
 }
@@ -1202,8 +1201,7 @@ static void dm1105_remove(struct pci_dev *pdev)
         dvb_dmxdev_release(&dev->dmxdev);
         dvb_dmx_release(dvbdemux);
         dvb_unregister_adapter(dvb_adapter);
-        if (&dev->i2c_adap)
-                i2c_del_adapter(&dev->i2c_adap);
+        i2c_del_adapter(&dev->i2c_adap);
 
         dm1105_hw_exit(dev);
         synchronize_irq(pdev->irq);
@@ -1211,7 +1209,6 @@ static void dm1105_remove(struct pci_dev *pdev)
         pci_iounmap(pdev, dev->io_mem);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
         dm1105_devcount--;
         kfree(dev);
 }
diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
index c08ae3eb9554..802642d26643 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.c
+++ b/drivers/media/pci/ivtv/ivtv-driver.c
@@ -1261,7 +1261,7 @@ static int ivtv_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
 
         /* Register IRQ */
         retval = request_irq(itv->pdev->irq, ivtv_irq_handler,
-             IRQF_SHARED | IRQF_DISABLED, itv->v4l2_dev.name, (void *)itv);
+             IRQF_SHARED, itv->v4l2_dev.name, (void *)itv);
         if (retval) {
                 IVTV_ERR("Failed to register irq %d\n", retval);
                 goto free_i2c;
diff --git a/drivers/media/pci/mantis/mantis_pci.c b/drivers/media/pci/mantis/mantis_pci.c
index a846036ea022..9e89e045213a 100644
--- a/drivers/media/pci/mantis/mantis_pci.c
+++ b/drivers/media/pci/mantis/mantis_pci.c
@@ -143,7 +143,6 @@ fail1:
 
 fail0:
         dprintk(MANTIS_ERROR, 1, "ERROR: <%d> exiting", ret);
-        pci_set_drvdata(pdev, NULL);
         return ret;
 }
 EXPORT_SYMBOL_GPL(mantis_pci_init);
@@ -161,7 +160,6 @@ void mantis_pci_exit(struct mantis_pci *mantis)
         }
 
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
 }
 EXPORT_SYMBOL_GPL(mantis_pci_exit);
 
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index 2381b05432e6..54d5c821007c 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1698,7 +1698,7 @@ static int meye_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
 
         meye.mchip_irq = pcidev->irq;
         if (request_irq(meye.mchip_irq, meye_irq,
-                        IRQF_DISABLED | IRQF_SHARED, "meye", meye_irq)) {
+                        IRQF_SHARED, "meye", meye_irq)) {
                 v4l2_err(v4l2_dev, "request_irq failed\n");
                 goto outreqirq;
         }
diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c
index 37ebc42392ad..970e83308525 100644
--- a/drivers/media/pci/ngene/ngene-core.c
+++ b/drivers/media/pci/ngene/ngene-core.c
@@ -1622,7 +1622,7 @@ static void ngene_unlink(struct ngene *dev)
 
 void ngene_shutdown(struct pci_dev *pdev)
 {
-        struct ngene *dev = (struct ngene *)pci_get_drvdata(pdev);
+        struct ngene *dev = pci_get_drvdata(pdev);
 
         if (!dev || !shutdown_workaround)
                 return;
@@ -1648,7 +1648,6 @@ void ngene_remove(struct pci_dev *pdev)
                 cxd_detach(dev);
         ngene_stop(dev);
         ngene_release_buffers(dev);
-        pci_set_drvdata(pdev, NULL);
         pci_disable_device(pdev);
 }
 
@@ -1702,6 +1701,5 @@ fail1:
         ngene_release_buffers(dev);
 fail0:
         pci_disable_device(pci_dev);
-        pci_set_drvdata(pci_dev, NULL);
         return stat;
 }
diff --git a/drivers/media/pci/pluto2/pluto2.c b/drivers/media/pci/pluto2/pluto2.c
index 493828500055..8164d74b46a4 100644
--- a/drivers/media/pci/pluto2/pluto2.c
+++ b/drivers/media/pci/pluto2/pluto2.c
@@ -736,7 +736,6 @@ err_pci_release_regions:
 err_pci_disable_device:
         pci_disable_device(pdev);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(pluto);
         goto out;
 }
@@ -765,7 +764,6 @@ static void pluto2_remove(struct pci_dev *pdev)
         pci_iounmap(pdev, pluto->io_mem);
         pci_release_regions(pdev);
         pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
         kfree(pluto);
 }
 
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index 75ce14229e03..db887b0c37b1 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -1076,7 +1076,6 @@ static void pt1_remove(struct pci_dev *pdev)
         pt1_update_power(pt1);
         pt1_cleanup_adapters(pt1);
         i2c_del_adapter(&pt1->i2c_adap);
-        pci_set_drvdata(pdev, NULL);
         kfree(pt1);
         pci_iounmap(pdev, regs);
         pci_release_regions(pdev);
@@ -1198,7 +1197,6 @@ err_i2c_del_adapter:
 err_pt1_cleanup_adapters:
         pt1_cleanup_adapters(pt1);
 err_kfree:
-        pci_set_drvdata(pdev, NULL);
         kfree(pt1);
 err_pci_iounmap:
         pci_iounmap(pdev, regs);
diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
index dbcdfbf8aed0..dd67c8a400cc 100644
--- a/drivers/media/pci/saa7134/saa7134-alsa.c
+++ b/drivers/media/pci/saa7134/saa7134-alsa.c
@@ -1096,7 +1096,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum)
 
 
         err = request_irq(dev->pci->irq, saa7134_alsa_irq,
-                                IRQF_SHARED | IRQF_DISABLED, dev->name,
+                                IRQF_SHARED, dev->name,
                                 (void*) &dev->dmasound);
 
         if (err < 0) {
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 45f0aca597ae..27d7ee709c58 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -992,7 +992,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
 
         /* get irq */
         err = request_irq(pci_dev->irq, saa7134_irq,
-                          IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                          IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name,pci_dev->irq);
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index d37ee37aaefe..57ef5456f1e8 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1232,7 +1232,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev,
         }
 
         err = request_irq(pci_dev->irq, saa7164_irq,
-                IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
+                IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n", dev->name,
                         pci_dev->irq);
@@ -1439,7 +1439,6 @@ static void saa7164_finidev(struct pci_dev *pci_dev)
 
         /* unregister stuff */
         free_irq(pci_dev->irq, dev);
-        pci_set_drvdata(pci_dev, NULL);
 
         mutex_lock(&devlist);
         list_del(&dev->devlist);
diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c
index 923d59a321f8..cec5b7553f28 100644
--- a/drivers/media/pci/zoran/zoran_card.c
+++ b/drivers/media/pci/zoran/zoran_card.c
@@ -1293,7 +1293,7 @@ static int zoran_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         result = request_irq(zr->pci_dev->irq, zoran_irq,
-                             IRQF_SHARED | IRQF_DISABLED, ZR_DEVNAME(zr), zr);
+                             IRQF_SHARED, ZR_DEVNAME(zr), zr);
         if (result < 0) {
                 if (result == -EINVAL) {
                         dprintk(1,