[media] i2c: Stop using I2C_CLASS_TV_ANALOG

Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no
I2C device driver is setting it anymore, which means it can be
dropped. I2C devices on analog TV adapters are instantiated
explicitly these days, which is much better.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/dvb/ngene/ngene-i2c.c
index 477fe0aade866bea99040fc8ca8b134883fc2919..38074e9cbb6d06d76b81dfadfbbce2bd496e8248 100644 (file)
--- a/drivers/media/dvb/ngene/ngene-i2c.c
+++ b/drivers/media/dvb/ngene/ngene-i2c.c
@@ -165,7 +165,7 @@ int ngene_i2c_init(struct ngene *dev, int dev_nr)
        struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
 
        i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
-       adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG;
+       adap->class = I2C_CLASS_TV_DIGITAL;
 
        strcpy(adap->name, "nGene");
 

diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index 463b81bef6e29585e2c3f0802adc40863f9845f2..409de11096d42c785f2b054330d6a266f1c38d7b 100644 (file)
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -127,7 +127,6 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
        strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
                sizeof(i2c_adap->name));
        i2c_adap->algo  = &hdpvr_algo;
-       i2c_adap->class = I2C_CLASS_TV_ANALOG;
        i2c_adap->owner = THIS_MODULE;
        i2c_adap->dev.parent = &dev->udev->dev;
 

diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index ad2c232baa6dce37bffb524bc68cf34591859bcc..7ae96367b3abef4e83e92caca7e784e53405ffca 100644 (file)
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -367,7 +367,6 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
 
        hexium->i2c_adapter = (struct i2c_adapter) {
-               .class = I2C_CLASS_TV_ANALOG,
                .name = "hexium gemini",
        };
        saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);

diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 938a1f8f880a0a2ca4471d3e2fc81ca722fad09e..b72d0f0b8310bd2f86869596e7a6aa94597e5fdd 100644 (file)
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -230,7 +230,6 @@ static int hexium_probe(struct saa7146_dev *dev)
        saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
 
        hexium->i2c_adapter = (struct i2c_adapter) {
-               .class = I2C_CLASS_TV_ANALOG,
                .name = "hexium orion",
        };
        saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);