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

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

[media] i2c: Stop using I2C_CLASS_TV_DIGITAL 



Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no
I2C device driver is setting it anymore, which means it can be
dropped. I2C devices on digital 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 0a5f1f21

drivers/media/dvb/b2c2/flexcop-i2c.c

+0 −3
Original line number Diff line number Diff line
@@ -245,9 +245,6 @@ int flexcop_i2c_init(struct flexcop_device *fc) 
	i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]);

	i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]);



	fc->fc_i2c_adap[0].i2c_adap.class =

		fc->fc_i2c_adap[1].i2c_adap.class =

		fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL;

	fc->fc_i2c_adap[0].i2c_adap.algo =

		fc->fc_i2c_adap[1].i2c_adap.algo =

		fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;

drivers/media/dvb/dm1105/dm1105.c

+0 −1
Original line number Diff line number Diff line
@@ -862,7 +862,6 @@ static int __devinit dm1105_probe(struct pci_dev *pdev, 
	i2c_set_adapdata(&dev->i2c_adap, dev);

	strcpy(dev->i2c_adap.name, DRIVER_NAME);

	dev->i2c_adap.owner = THIS_MODULE;

	dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;

	dev->i2c_adap.dev.parent = &pdev->dev;

	dev->i2c_adap.algo = &dm1105_algo;

	dev->i2c_adap.algo_data = dev;

drivers/media/dvb/dvb-usb/af9015.c

+0 −5
Original line number Diff line number Diff line
@@ -1083,11 +1083,6 @@ static int af9015_i2c_init(struct dvb_usb_device *d) 


	strncpy(state->i2c_adap.name, d->desc->name,

		sizeof(state->i2c_adap.name));

#ifdef I2C_ADAP_CLASS_TV_DIGITAL

	state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,

#else

	state->i2c_adap.class = I2C_CLASS_TV_DIGITAL,

#endif

	state->i2c_adap.algo      = d->props.i2c_algo;

	state->i2c_adap.algo_data = NULL;

	state->i2c_adap.dev.parent = &d->udev->dev;

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

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) 
	}



	strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));

	d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,

	d->i2c_adap.algo      = d->props.i2c_algo;

	d->i2c_adap.algo_data = NULL;

	d->i2c_adap.dev.parent = &d->udev->dev;

drivers/media/dvb/frontends/cx24123.c

+0 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,6 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config, 


	strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",

		sizeof(state->tuner_i2c_adapter.name));

	state->tuner_i2c_adapter.class     = I2C_CLASS_TV_DIGITAL,

	state->tuner_i2c_adapter.algo      = &cx24123_tuner_i2c_algo;

	state->tuner_i2c_adapter.algo_data = NULL;

	i2c_set_adapdata(&state->tuner_i2c_adapter, state);