V4L/DVB (11278): bttv: convert to v4l2_subdev since i2c autoprobing will disappear.

Since i2c autoprobing will disappear bttv needs to be converted to use
v4l2_subdev instead.

Without autoprobing the autoload module option has become obsolete. A warning
is generated if it is set, but it is otherwise ignored.

Since the bttv card definitions are of questionable value a new option was
introduced to allow the user to control which audio module is selected:
msp3400, tda7432 or tvaudio (or none at all).

By default bttv will use the card definitions and fallback on tvaudio as the
last resort.

If no audio device was found a warning is printed.

The saa6588 RDS device is now also explicitly probed since it is no longer
possible to autoprobe it. A new saa6588 module option was added to override
the card definition since I suspect more cards have this device than one
would guess from the card definitions.

Note that the probe addresses of the i2c modules are hardcoded in this
driver. Once all v4l drivers are converted to v4l2_subdev this will be
cleaned up. Such data belongs in an i2c driver header.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 0 insertions, 53 deletions

diff --git a/drivers/media/video/bt8xx/bttv-i2c.c b/drivers/media/video/bt8xx/bttv-i2c.c
index 9b66c5b09321..a99d92fac3dc 100644
--- a/drivers/media/video/bt8xx/bttv-i2c.c
+++ b/drivers/media/video/bt8xx/bttv-i2c.c
@@ -36,8 +36,6 @@
 #include <linux/jiffies.h>
 #include <asm/io.h>
 
-static int attach_inform(struct i2c_client *client);
-
 static int i2c_debug;
 static int i2c_hw;
 static int i2c_scan;
@@ -266,51 +264,6 @@ static const struct i2c_algorithm bttv_algo = {
 /* ----------------------------------------------------------------------- */
 /* I2C functions - common stuff                                            */
 
-static int attach_inform(struct i2c_client *client)
-{
-        struct v4l2_device *v4l2_dev = i2c_get_adapdata(client->adapter);
-        struct bttv *btv = to_bttv(v4l2_dev);
-        int addr=ADDR_UNSET;
-
-
-        if (ADDR_UNSET != bttv_tvcards[btv->c.type].tuner_addr)
-                addr = bttv_tvcards[btv->c.type].tuner_addr;
-
-
-        if (bttv_debug)
-                printk(KERN_DEBUG "bttv%d: %s i2c attach [addr=0x%x,client=%s]\n",
-                        btv->c.nr, client->driver->driver.name, client->addr,
-                        client->name);
-        if (!client->driver->command)
-                return 0;
-
-        if (client->driver->id == I2C_DRIVERID_MSP3400)
-                btv->i2c_msp34xx_client = client;
-        if (client->driver->id == I2C_DRIVERID_TVAUDIO)
-                btv->i2c_tvaudio_client = client;
-        if (btv->tuner_type != TUNER_ABSENT) {
-                struct tuner_setup tun_setup;
-
-                if (addr == ADDR_UNSET || addr == client->addr) {
-                        tun_setup.mode_mask = T_ANALOG_TV | T_DIGITAL_TV | T_RADIO;
-                        tun_setup.type = btv->tuner_type;
-                        tun_setup.addr = addr;
-                        bttv_call_i2c_clients(btv, TUNER_SET_TYPE_ADDR, &tun_setup);
-                }
-
-        }
-
-        return 0;
-}
-
-void bttv_call_i2c_clients(struct bttv *btv, unsigned int cmd, void *arg)
-{
-        if (0 != btv->i2c_rc)
-                return;
-        i2c_clients_command(&btv->c.i2c_adap, cmd, arg);
-}
-
-
 /* read I2C */
 int bttv_I2CRead(struct bttv *btv, unsigned char addr, char *probe_for)
 {
@@ -417,8 +370,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
                 btv->c.i2c_adap.algo_data = &btv->i2c_algo;
         }
         btv->c.i2c_adap.owner = THIS_MODULE;
-        btv->c.i2c_adap.class = I2C_CLASS_TV_ANALOG;
-        btv->c.i2c_adap.client_register = attach_inform;
 
         btv->c.i2c_adap.dev.parent = &btv->c.pci->dev;
         snprintf(btv->c.i2c_adap.name, sizeof(btv->c.i2c_adap.name),
@@ -428,10 +379,6 @@ int __devinit init_bttv_i2c(struct bttv *btv)
         i2c_set_adapdata(&btv->c.i2c_adap, &btv->c.v4l2_dev);
         btv->i2c_client.adapter = &btv->c.i2c_adap;
 
-        if (bttv_tvcards[btv->c.type].no_video)
-                btv->c.i2c_adap.class &= ~I2C_CLASS_TV_ANALOG;
-        if (bttv_tvcards[btv->c.type].has_dvb)
-                btv->c.i2c_adap.class |= I2C_CLASS_TV_DIGITAL;
 
         if (btv->use_i2c_hw) {
                 btv->i2c_rc = i2c_add_adapter(&btv->c.i2c_adap);