V4L/DVB (7753): saa7134: fix tuner setup

Tuner setup were happening during i2c attach callback. This means that it would
happen on two conditions:

        1) if tuner module weren't load, it will happen at request_module("tuner");

        2) if tuner is not compiled as a module, or it is already loaded
           (for example, on setups with more than one tuner), it will happen
           when saa7134 registers I2C bus.

Due to that, if tuner were loaded, tuner setup will happen _before_ reading
the proper values at tuner eeprom. Since set_addr refuses to change for a tuner
that were previously defined (except if the tuner_addr is set), this were
making eeprom tuner detection useless.

This patch removes tuner type setup from saa7134-i2c, moving it to the proper
place, after taking eeprom into account.

Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 0 insertions, 42 deletions

diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 2ccfaba0c490..d8af3863f2d3 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -324,8 +324,6 @@ static u32 functionality(struct i2c_adapter *adap)
 static int attach_inform(struct i2c_client *client)
 {
         struct saa7134_dev *dev = client->adapter->algo_data;
-        int tuner = dev->tuner_type;
-        struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
                 client->driver->driver.name, client->addr, client->name);
@@ -346,46 +344,6 @@ static int attach_inform(struct i2c_client *client)
                 }
         }
 
-        if (!client->driver->command)
-                return 0;
-
-        if (saa7134_boards[dev->board].radio_type != UNSET) {
-
-                tun_setup.type = saa7134_boards[dev->board].radio_type;
-                tun_setup.addr = saa7134_boards[dev->board].radio_addr;
-
-                if ((tun_setup.addr == ADDR_UNSET) || (tun_setup.addr == client->addr)) {
-                        tun_setup.mode_mask = T_RADIO;
-
-                        client->driver->command(client, TUNER_SET_TYPE_ADDR, &tun_setup);
-                }
-        }
-
-        if (tuner != UNSET) {
-                tun_setup.type = tuner;
-                tun_setup.addr = saa7134_boards[dev->board].tuner_addr;
-                tun_setup.config = saa7134_boards[dev->board].tuner_config;
-                tun_setup.tuner_callback = saa7134_tuner_callback;
-
-                if ((tun_setup.addr == ADDR_UNSET)||(tun_setup.addr == client->addr)) {
-
-                        tun_setup.mode_mask = T_ANALOG_TV;
-
-                        client->driver->command(client,TUNER_SET_TYPE_ADDR, &tun_setup);
-                }
-
-                if (tuner == TUNER_TDA9887) {
-                        struct v4l2_priv_tun_config tda9887_cfg;
-
-                        tda9887_cfg.tuner = TUNER_TDA9887;
-                        tda9887_cfg.priv = &dev->tda9887_conf;
-
-                        client->driver->command(client, TUNER_SET_CONFIG,
-                                                &tda9887_cfg);
-                }
-        }
-
-
         return 0;
 }