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

[deliverable/linux.git] / drivers / media / video / cx88 / cx88-i2c.c

diff --git a/drivers/media/video/cx88/cx88-i2c.c b/drivers/media/video/cx88/cx88-i2c.c
index 78bbcfab96700ba9019c20a383db1f5ab5dc5984..6b42dea860fd6876cadffac87f0e5fa0504b34c8 100644 (file)
--- 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;