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

diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 78bbcfab9670..6b42dea860fd 100644
--- a/drivers/media/video/cx88/cx88-i2c.c
+++ b/drivers/media/video/cx88/cx88-i2c.c
@@ -108,28 +108,28 @@ static int attach_inform(struct i2c_client *client)
         if (!client->driver->command)
                 return 0;
 
-        if (core->radio_type != UNSET) {
-                if ((core->radio_addr==ADDR_UNSET)||(core->radio_addr==client->addr)) {
+        if (core->board.radio_type != UNSET) {
+                if ((core->board.radio_addr==ADDR_UNSET)||(core->board.radio_addr==client->addr)) {
                         tun_setup.mode_mask = T_RADIO;
-                        tun_setup.type = core->radio_type;
-                        tun_setup.addr = core->radio_addr;
+                        tun_setup.type = core->board.radio_type;
+                        tun_setup.addr = core->board.radio_addr;
 
                         client->driver->command (client, TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
         }
-        if (core->tuner_type != UNSET) {
-                if ((core->tuner_addr==ADDR_UNSET)||(core->tuner_addr==client->addr)) {
+        if (core->board.tuner_type != UNSET) {
+                if ((core->board.tuner_addr==ADDR_UNSET)||(core->board.tuner_addr==client->addr)) {
 
                         tun_setup.mode_mask = T_ANALOG_TV;
-                        tun_setup.type = core->tuner_type;
-                        tun_setup.addr = core->tuner_addr;
+                        tun_setup.type = core->board.tuner_type;
+                        tun_setup.addr = core->board.tuner_addr;
 
                         client->driver->command (client,TUNER_SET_TYPE_ADDR, &tun_setup);
                 }
         }
 
-        if (core->tda9887_conf)
-                client->driver->command(client, TDA9887_SET_CONFIG, &core->tda9887_conf);
+        if (core->board.tda9887_conf)
+                client->driver->command(client, TDA9887_SET_CONFIG, &core->board.tda9887_conf);
         return 0;
 }
 
@@ -204,9 +204,9 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci)
         memcpy(&core->i2c_algo, &cx8800_i2c_algo_template,
                sizeof(core->i2c_algo));
 
-        if (core->tuner_type != TUNER_ABSENT)
+        if (core->board.tuner_type != TUNER_ABSENT)
                 core->i2c_adap.class |= I2C_CLASS_TV_ANALOG;
-        if (cx88_boards[core->board].mpeg & CX88_MPEG_DVB)
+        if (core->board.mpeg & CX88_MPEG_DVB)
                 core->i2c_adap.class |= I2C_CLASS_TV_DIGITAL;
 
         core->i2c_adap.dev.parent = &pci->dev;