1 files changed, 15 insertions, 16 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index f2fcdb92ecce..6d6f5048d762 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -27,7 +27,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/delay.h>
@@ -734,14 +733,14 @@ static int vidioc_querycap (struct file *file, void  *priv,
         struct cx88_core  *core = dev->core;
 
         strcpy(cap->driver, "cx88_blackbird");
-        strlcpy(cap->card, cx88_boards[core->board].name,sizeof(cap->card));
+        strlcpy(cap->card, core->board.name, sizeof(cap->card));
         sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci));
         cap->version = CX88_VERSION_CODE;
         cap->capabilities =
                 V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_READWRITE     |
                 V4L2_CAP_STREAMING;
-        if (UNSET != core->tuner_type)
+        if (UNSET != core->board.tuner_type)
                 cap->capabilities |= V4L2_CAP_TUNER;
         return 0;
 }
@@ -877,7 +876,7 @@ static int vidioc_g_ext_ctrls (struct file *file, void *priv,
 
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
-        return cx2341x_ext_ctrls(&dev->params, f, VIDIOC_G_EXT_CTRLS);
+        return cx2341x_ext_ctrls(&dev->params, 0, f, VIDIOC_G_EXT_CTRLS);
 }
 
 static int vidioc_s_ext_ctrls (struct file *file, void *priv,
@@ -890,7 +889,7 @@ static int vidioc_s_ext_ctrls (struct file *file, void *priv,
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
         p = dev->params;
-        err = cx2341x_ext_ctrls(&p, f, VIDIOC_S_EXT_CTRLS);
+        err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_S_EXT_CTRLS);
         if (!err) {
                 err = cx2341x_update(dev, blackbird_mbox_func, &dev->params, &p);
                 dev->params = p;
@@ -908,7 +907,7 @@ static int vidioc_try_ext_ctrls (struct file *file, void *priv,
         if (f->ctrl_class != V4L2_CTRL_CLASS_MPEG)
                 return -EINVAL;
         p = dev->params;
-        err = cx2341x_ext_ctrls(&p, f, VIDIOC_TRY_EXT_CTRLS);
+        err = cx2341x_ext_ctrls(&p, 0, f, VIDIOC_TRY_EXT_CTRLS);
 
         return err;
 }
@@ -990,7 +989,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
         struct cx8802_fh  *fh   = priv;
         struct cx88_core  *core = fh->dev->core;
 
-        if (unlikely(UNSET == core->tuner_type))
+        if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
 
         f->type = V4L2_TUNER_ANALOG_TV;
@@ -1028,7 +1027,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
         struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
         u32 reg;
 
-        if (unlikely(UNSET == core->tuner_type))
+        if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
         if (0 != t->index)
                 return -EINVAL;
@@ -1049,7 +1048,7 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 {
         struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
 
-        if (UNSET == core->tuner_type)
+        if (UNSET == core->board.tuner_type)
                 return -EINVAL;
         if (0 != t->index)
                 return -EINVAL;
@@ -1078,7 +1077,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         struct cx8802_driver *drv = NULL;
         int err;
 
-       dev = cx8802_get_device(inode);
+        dev = cx8802_get_device(inode);
 
         dprintk( 1, "%s\n", __FUNCTION__);
 
@@ -1112,7 +1111,7 @@ static int mpeg_open(struct inode *inode, struct file *file)
         file->private_data = fh;
         fh->dev      = dev;
 
-        videobuf_queue_init(&fh->mpegq, &blackbird_qops,
+        videobuf_queue_pci_init(&fh->mpegq, &blackbird_qops,
                             dev->pci, &dev->slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
@@ -1235,7 +1234,7 @@ static struct video_device cx8802_mpeg_template =
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_s_std         = vidioc_s_std,
         .tvnorms              = CX88_NORMS,
-       .current_norm         = V4L2_STD_NTSC_M,
+        .current_norm         = V4L2_STD_NTSC_M,
 };
 
 /* ------------------------------------------------------------------ */
@@ -1246,7 +1245,7 @@ static int cx8802_blackbird_advise_acquire(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
         int err = 0;
 
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
                 /* By default, core setup will leave the cx22702 out of reset, on the bus.
                  * We left the hardware on power up with the cx22702 active.
@@ -1268,7 +1267,7 @@ static int cx8802_blackbird_advise_release(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
         int err = 0;
 
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
                 /* Exit leaving the cx23416 on the bus */
                 break;
@@ -1316,13 +1315,13 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
 
         dprintk( 1, "%s\n", __FUNCTION__);
         dprintk( 1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
-                core->board,
+                core->boardnr,
                 core->name,
                 core->pci_bus,
                 core->pci_slot);
 
         err = -ENODEV;
-        if (!(cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD))
+        if (!(core->board.mpeg & CX88_MPEG_BLACKBIRD))
                 goto fail_core;
 
         dev->width = 720;