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, 5 insertions, 5 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 1773b40467dc..d98b90721019 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -378,7 +378,7 @@ static int dvb_register(struct cx8802_dev *dev)
         dev->ts_gen_cntrl = 0x0c;
 
         /* init frontend */
-        switch (dev->core->board) {
+        switch (dev->core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
                 dev->dvb.frontend = dvb_attach(cx22702_attach,
                                                &connexant_refboard_config,
@@ -653,7 +653,7 @@ static int cx8802_dvb_advise_acquire(struct cx8802_driver *drv)
         int err = 0;
         dprintk( 1, "%s\n", __FUNCTION__);
 
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
                 /* We arrive here with either the cx23416 or the cx22702
                  * on the bus. Take the bus from the cx23416 and enable the
@@ -676,7 +676,7 @@ static int cx8802_dvb_advise_release(struct cx8802_driver *drv)
         int err = 0;
         dprintk( 1, "%s\n", __FUNCTION__);
 
-        switch (core->board) {
+        switch (core->boardnr) {
         case CX88_BOARD_HAUPPAUGE_HVR1300:
                 /* Do Nothing, leave the cx22702 on the bus. */
                 break;
@@ -694,13 +694,13 @@ static int cx8802_dvb_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_DVB))
+        if (!(core->board.mpeg & CX88_MPEG_DVB))
                 goto fail_core;
 
         /* If vp3054 isn't enabled, a stub will just return 0 */