Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5f1f21 authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2962fc01

drivers/media/dvb/ngene/ngene-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/media/video/hdpvr/hdpvr-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/hexium_gemini.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/hexium_orion.c

+0 −1
Original line number Diff line number Diff line
@@ -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);