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

[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
...@@ -245,9 +245,6 @@ int flexcop_i2c_init(struct flexcop_device *fc) ...@@ -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[1].i2c_adap, &fc->fc_i2c_adap[1]);
i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]); 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[0].i2c_adap.algo =
fc->fc_i2c_adap[1].i2c_adap.algo = fc->fc_i2c_adap[1].i2c_adap.algo =
fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo; fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo;
......
...@@ -862,7 +862,6 @@ static int __devinit dm1105_probe(struct pci_dev *pdev, ...@@ -862,7 +862,6 @@ static int __devinit dm1105_probe(struct pci_dev *pdev,
i2c_set_adapdata(&dev->i2c_adap, dev); i2c_set_adapdata(&dev->i2c_adap, dev);
strcpy(dev->i2c_adap.name, DRIVER_NAME); strcpy(dev->i2c_adap.name, DRIVER_NAME);
dev->i2c_adap.owner = THIS_MODULE; dev->i2c_adap.owner = THIS_MODULE;
dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
dev->i2c_adap.dev.parent = &pdev->dev; dev->i2c_adap.dev.parent = &pdev->dev;
dev->i2c_adap.algo = &dm1105_algo; dev->i2c_adap.algo = &dm1105_algo;
dev->i2c_adap.algo_data = dev; dev->i2c_adap.algo_data = dev;
......
...@@ -1083,11 +1083,6 @@ static int af9015_i2c_init(struct dvb_usb_device *d) ...@@ -1083,11 +1083,6 @@ static int af9015_i2c_init(struct dvb_usb_device *d)
strncpy(state->i2c_adap.name, d->desc->name, strncpy(state->i2c_adap.name, d->desc->name,
sizeof(state->i2c_adap.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 = d->props.i2c_algo;
state->i2c_adap.algo_data = NULL; state->i2c_adap.algo_data = NULL;
state->i2c_adap.dev.parent = &d->udev->dev; state->i2c_adap.dev.parent = &d->udev->dev;
......
...@@ -20,7 +20,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d) ...@@ -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)); 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 = d->props.i2c_algo;
d->i2c_adap.algo_data = NULL; d->i2c_adap.algo_data = NULL;
d->i2c_adap.dev.parent = &d->udev->dev; d->i2c_adap.dev.parent = &d->udev->dev;
......
...@@ -1108,7 +1108,6 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config, ...@@ -1108,7 +1108,6 @@ struct dvb_frontend *cx24123_attach(const struct cx24123_config *config,
strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus",
sizeof(state->tuner_i2c_adapter.name)); 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 = &cx24123_tuner_i2c_algo;
state->tuner_i2c_adapter.algo_data = NULL; state->tuner_i2c_adapter.algo_data = NULL;
i2c_set_adapdata(&state->tuner_i2c_adapter, state); i2c_set_adapdata(&state->tuner_i2c_adapter, state);
......
...@@ -130,7 +130,6 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap, ...@@ -130,7 +130,6 @@ static int i2c_adapter_init(struct i2c_adapter *i2c_adap,
struct dibx000_i2c_master *mst) struct dibx000_i2c_master *mst)
{ {
strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); strncpy(i2c_adap->name, name, sizeof(i2c_adap->name));
i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo;
i2c_adap->algo_data = NULL; i2c_adap->algo_data = NULL;
i2c_set_adapdata(i2c_adap, mst); i2c_set_adapdata(i2c_adap, mst);
if (i2c_add_adapter(i2c_adap) < 0) if (i2c_add_adapter(i2c_adap) < 0)
......
...@@ -920,7 +920,6 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config, ...@@ -920,7 +920,6 @@ struct dvb_frontend *s5h1420_attach(const struct s5h1420_config *config,
/* create tuner i2c adapter */ /* create tuner i2c adapter */
strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus",
sizeof(state->tuner_i2c_adapter.name)); sizeof(state->tuner_i2c_adapter.name));
state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL,
state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo;
state->tuner_i2c_adapter.algo_data = NULL; state->tuner_i2c_adapter.algo_data = NULL;
i2c_set_adapdata(&state->tuner_i2c_adapter, state); i2c_set_adapdata(&state->tuner_i2c_adapter, state);
......
...@@ -229,7 +229,6 @@ int __devinit mantis_i2c_init(struct mantis_pci *mantis) ...@@ -229,7 +229,6 @@ int __devinit mantis_i2c_init(struct mantis_pci *mantis)
i2c_set_adapdata(i2c_adapter, mantis); i2c_set_adapdata(i2c_adapter, mantis);
i2c_adapter->owner = THIS_MODULE; i2c_adapter->owner = THIS_MODULE;
i2c_adapter->class = I2C_CLASS_TV_DIGITAL;
i2c_adapter->algo = &mantis_algo; i2c_adapter->algo = &mantis_algo;
i2c_adapter->algo_data = NULL; i2c_adapter->algo_data = NULL;
i2c_adapter->timeout = 500; i2c_adapter->timeout = 500;
......
...@@ -165,7 +165,6 @@ int ngene_i2c_init(struct ngene *dev, int dev_nr) ...@@ -165,7 +165,6 @@ int ngene_i2c_init(struct ngene *dev, int dev_nr)
struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter);
i2c_set_adapdata(adap, &(dev->channel[dev_nr])); i2c_set_adapdata(adap, &(dev->channel[dev_nr]));
adap->class = I2C_CLASS_TV_DIGITAL;
strcpy(adap->name, "nGene"); strcpy(adap->name, "nGene");
......
...@@ -647,7 +647,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev, ...@@ -647,7 +647,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
i2c_set_adapdata(&pluto->i2c_adap, pluto); i2c_set_adapdata(&pluto->i2c_adap, pluto);
strcpy(pluto->i2c_adap.name, DRIVER_NAME); strcpy(pluto->i2c_adap.name, DRIVER_NAME);
pluto->i2c_adap.owner = THIS_MODULE; pluto->i2c_adap.owner = THIS_MODULE;
pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
pluto->i2c_adap.dev.parent = &pdev->dev; pluto->i2c_adap.dev.parent = &pdev->dev;
pluto->i2c_adap.algo_data = &pluto->i2c_bit; pluto->i2c_adap.algo_data = &pluto->i2c_bit;
pluto->i2c_bit.data = pluto; pluto->i2c_bit.data = pluto;
......
...@@ -1087,7 +1087,6 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -1087,7 +1087,6 @@ pt1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
pt1_update_power(pt1); pt1_update_power(pt1);
i2c_adap = &pt1->i2c_adap; i2c_adap = &pt1->i2c_adap;
i2c_adap->class = I2C_CLASS_TV_DIGITAL;
i2c_adap->algo = &pt1_i2c_algo; i2c_adap->algo = &pt1_i2c_algo;
i2c_adap->algo_data = NULL; i2c_adap->algo_data = NULL;
i2c_adap->dev.parent = &pdev->dev; i2c_adap->dev.parent = &pdev->dev;
......
...@@ -2476,7 +2476,6 @@ static int __devinit av7110_attach(struct saa7146_dev* dev, ...@@ -2476,7 +2476,6 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
get recognized before the main driver is fully loaded */ get recognized before the main driver is fully loaded */
saa7146_write(dev, GPIO_CTRL, 0x500000); saa7146_write(dev, GPIO_CTRL, 0x500000);
av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name));
saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */
......
...@@ -495,8 +495,6 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev, ...@@ -495,8 +495,6 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev,
if (bi->type != BUDGET_FS_ACTIVY) if (bi->type != BUDGET_FS_ACTIVY)
saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */
budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name));
saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120);
......
...@@ -1694,7 +1694,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -1694,7 +1694,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
i2c_set_adapdata(&ttusb->i2c_adap, ttusb); i2c_set_adapdata(&ttusb->i2c_adap, ttusb);
ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
ttusb->i2c_adap.algo = &ttusb_dec_algo; ttusb->i2c_adap.algo = &ttusb_dec_algo;
ttusb->i2c_adap.algo_data = NULL; ttusb->i2c_adap.algo_data = NULL;
ttusb->i2c_adap.dev.parent = &udev->dev; ttusb->i2c_adap.dev.parent = &udev->dev;
......
...@@ -121,8 +121,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev) ...@@ -121,8 +121,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev)
memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
sizeof(vp3054_i2c->algo)); sizeof(vp3054_i2c->algo));
vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
vp3054_i2c->adap.dev.parent = &dev->pci->dev; vp3054_i2c->adap.dev.parent = &dev->pci->dev;
strlcpy(vp3054_i2c->adap.name, core->name, strlcpy(vp3054_i2c->adap.name, core->name,
sizeof(vp3054_i2c->adap.name)); sizeof(vp3054_i2c->adap.name));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment