V4L/DVB (6021): cx88: Copy board information into card state

The cx88 driver state stored the ID of the board type in core->board.  Every
time the driver need to get some information about the board configuration, it
uses the board number as an index into board configuration array.

This patch changes it so that the board number is in core->boardnr, and
core->board is a copy of the board configuration information.  This allows
access to board information without the extra indirection.  e.g.
cx88_boards[core->board].mpeg becomes core->board.mpeg.

This has a number of advantages:
- The code is simpler to write.

- It compiles to be smaller and faster, without needing the extra array lookup
  to get at the board information.

- The cx88_boards array no longer needs to be exported to all cx88 modules.

- The boards array can be made const

- It should be possible to avoid keeping the (large) cx88_boards array around
  after the module is loaded.

- If module parameters or eeprom info override some board configuration
  setting, it's not necessary to modify the boards array, which would
  affect all boards of the same type.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 30 insertions, 33 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 58ec76be436c..b0dd4313a841 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -368,17 +368,17 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
         /* struct cx88_core *core = dev->core; */
 
         dprintk(1,"video_mux: %d [vmux=%d,gpio=0x%x,0x%x,0x%x,0x%x]\n",
-                input, INPUT(input)->vmux,
-                INPUT(input)->gpio0,INPUT(input)->gpio1,
-                INPUT(input)->gpio2,INPUT(input)->gpio3);
+                input, INPUT(input).vmux,
+                INPUT(input).gpio0,INPUT(input).gpio1,
+                INPUT(input).gpio2,INPUT(input).gpio3);
         core->input = input;
-        cx_andor(MO_INPUT_FORMAT, 0x03 << 14, INPUT(input)->vmux << 14);
-        cx_write(MO_GP3_IO, INPUT(input)->gpio3);
-        cx_write(MO_GP0_IO, INPUT(input)->gpio0);
-        cx_write(MO_GP1_IO, INPUT(input)->gpio1);
-        cx_write(MO_GP2_IO, INPUT(input)->gpio2);
+        cx_andor(MO_INPUT_FORMAT, 0x03 << 14, INPUT(input).vmux << 14);
+        cx_write(MO_GP3_IO, INPUT(input).gpio3);
+        cx_write(MO_GP0_IO, INPUT(input).gpio0);
+        cx_write(MO_GP1_IO, INPUT(input).gpio1);
+        cx_write(MO_GP2_IO, INPUT(input).gpio2);
 
-        switch (INPUT(input)->type) {
+        switch (INPUT(input).type) {
         case CX88_VMUX_SVIDEO:
                 cx_set(MO_AFECFG_IO,    0x00000001);
                 cx_set(MO_INPUT_FORMAT, 0x00010010);
@@ -393,9 +393,9 @@ int cx88_video_mux(struct cx88_core *core, unsigned int input)
                 break;
         }
 
-        if (cx88_boards[core->board].mpeg & CX88_MPEG_BLACKBIRD) {
+        if (core->board.mpeg & CX88_MPEG_BLACKBIRD) {
                 /* sets sound input from external adc */
-                if (INPUT(input)->extadc)
+                if (INPUT(input).extadc)
                         cx_set(AUD_CTL, EN_I2SIN_ENABLE);
                 else
                         cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
@@ -767,12 +767,11 @@ static int video_open(struct inode *inode, struct file *file)
                             fh);
 
         if (fh->radio) {
-                int board = core->board;
                 dprintk(1,"video_open: setting radio device\n");
-                cx_write(MO_GP3_IO, cx88_boards[board].radio.gpio3);
-                cx_write(MO_GP0_IO, cx88_boards[board].radio.gpio0);
-                cx_write(MO_GP1_IO, cx88_boards[board].radio.gpio1);
-                cx_write(MO_GP2_IO, cx88_boards[board].radio.gpio2);
+                cx_write(MO_GP3_IO, core->board.radio.gpio3);
+                cx_write(MO_GP0_IO, core->board.radio.gpio0);
+                cx_write(MO_GP1_IO, core->board.radio.gpio1);
+                cx_write(MO_GP2_IO, core->board.radio.gpio2);
                 core->tvaudio = WW_FM;
                 cx88_set_tvaudio(core);
                 cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
@@ -1078,8 +1077,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
         struct cx88_core  *core = dev->core;
 
         strcpy(cap->driver, "cx8800");
-        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 =
@@ -1087,7 +1085,7 @@ static int vidioc_querycap (struct file *file, void  *priv,
                 V4L2_CAP_READWRITE     |
                 V4L2_CAP_STREAMING     |
                 V4L2_CAP_VBI_CAPTURE;
-        if (UNSET != core->tuner_type)
+        if (UNSET != core->board.tuner_type)
                 cap->capabilities |= V4L2_CAP_TUNER;
         return 0;
 }
@@ -1221,14 +1219,14 @@ int cx88_enum_input (struct cx88_core  *core,struct v4l2_input *i)
         n = i->index;
         if (n >= 4)
                 return -EINVAL;
-        if (0 == INPUT(n)->type)
+        if (0 == INPUT(n).type)
                 return -EINVAL;
         memset(i,0,sizeof(*i));
         i->index = n;
         i->type  = V4L2_INPUT_TYPE_CAMERA;
-        strcpy(i->name,iname[INPUT(n)->type]);
-        if ((CX88_VMUX_TELEVISION == INPUT(n)->type) ||
-                (CX88_VMUX_CABLE      == INPUT(n)->type))
+        strcpy(i->name,iname[INPUT(n).type]);
+        if ((CX88_VMUX_TELEVISION == INPUT(n).type) ||
+            (CX88_VMUX_CABLE      == INPUT(n).type))
                 i->type = V4L2_INPUT_TYPE_TUNER;
                 i->std = CX88_NORMS;
         return 0;
@@ -1297,7 +1295,7 @@ static int vidioc_g_tuner (struct file *file, void *priv,
         struct cx88_core  *core = ((struct cx8800_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;
@@ -1318,7 +1316,7 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 {
         struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
 
-        if (UNSET == core->tuner_type)
+        if (UNSET == core->board.tuner_type)
                 return -EINVAL;
         if (0 != t->index)
                 return -EINVAL;
@@ -1333,7 +1331,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
         struct cx8800_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 = fh->radio ? V4L2_TUNER_RADIO : V4L2_TUNER_ANALOG_TV; */
@@ -1348,7 +1346,7 @@ static int vidioc_g_frequency (struct file *file, void *priv,
 int cx88_set_freq (struct cx88_core  *core,
                                 struct v4l2_frequency *f)
 {
-        if (unlikely(UNSET == core->tuner_type))
+        if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
         if (unlikely(f->tuner != 0))
                 return -EINVAL;
@@ -1419,8 +1417,7 @@ static int radio_querycap (struct file *file, void  *priv,
         struct cx88_core  *core = dev->core;
 
         strcpy(cap->driver, "cx8800");
-        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_TUNER;
@@ -1828,10 +1825,10 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         cx_set(MO_PCI_INTMSK, core->pci_irqmask);
 
         /* load and configure helper modules */
-        if (TUNER_ABSENT != core->tuner_type)
+        if (TUNER_ABSENT != core->board.tuner_type)
                 request_module("tuner");
 
-        if (cx88_boards[ core->board ].audio_chip == AUDIO_CHIP_WM8775)
+        if (core->board.audio_chip == AUDIO_CHIP_WM8775)
                 request_module("wm8775");
 
         /* register v4l devices */
@@ -1858,7 +1855,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         printk(KERN_INFO "%s/0: registered device vbi%d\n",
                core->name,dev->vbi_dev->minor & 0x1f);
 
-        if (core->has_radio) {
+        if (core->board.radio.type == CX88_RADIO) {
                 dev->radio_dev = cx88_vdev_init(core,dev->pci,
                                                 &cx8800_radio_template,"radio");
                 err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
@@ -1884,7 +1881,7 @@ static int __devinit cx8800_initdev(struct pci_dev *pci_dev,
         mutex_unlock(&core->lock);
 
         /* start tvaudio thread */
-        if (core->tuner_type != TUNER_ABSENT) {
+        if (core->board.tuner_type != TUNER_ABSENT) {
                 core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio");
                 if (IS_ERR(core->kthread)) {
                         err = PTR_ERR(core->kthread);