[PATCH] I2C: Kill i2c_algorithm.id (6/7)

In theory, there should be no more users of I2C_ALGO_* at this point.
However, it happens that several drivers were using I2C_ALGO_* for
adapter ids, so we need to correct these before we can get rid of all
the I2C_ALGO_* definitions.

Note that this also fixes a bug in media/video/tvaudio.c:

	/* don't attach on saa7146 based cards,
	   because dedicated drivers are used */
	if ((adap->id & I2C_ALGO_SAA7146))
		return 0;

This test was plain broken, as it would succeed for many more adapters
than just the saa7146: any those id would share at least one bit with
the saa7146 id. We are really lucky that the few other adapters we want
this driver to work with did not fulfill that condition.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 0 insertions, 4 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-i2c.c b/drivers/media/dvb/b2c2/flexcop-i2c.c
index 848910ff3c9c..56495cb6cd02 100644
--- a/drivers/media/dvb/b2c2/flexcop-i2c.c
+++ b/drivers/media/dvb/b2c2/flexcop-i2c.c
@@ -190,7 +190,6 @@ int flexcop_i2c_init(struct flexcop_device *fc)
         fc->i2c_adap.class          = I2C_CLASS_TV_DIGITAL;
         fc->i2c_adap.algo       = &flexcop_algo;
         fc->i2c_adap.algo_data  = NULL;
-        fc->i2c_adap.id         = I2C_ALGO_BIT;
 
         if ((ret = i2c_add_adapter(&fc->i2c_adap)) < 0)
                 return ret;
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 9f0a8d90d146..da970947dfc7 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -27,7 +27,6 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
 #endif
         d->i2c_adap.algo      = d->props.i2c_algo;
         d->i2c_adap.algo_data = NULL;
-        d->i2c_adap.id        = I2C_ALGO_BIT;
 
         i2c_set_adapdata(&d->i2c_adap, d);
 
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 706e0bcb5ede..85b437bbddcd 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -633,7 +633,6 @@ static int __devinit pluto2_probe(struct pci_dev *pdev,
         i2c_set_adapdata(&pluto->i2c_adap, pluto);
         strcpy(pluto->i2c_adap.name, DRIVER_NAME);
         pluto->i2c_adap.owner = THIS_MODULE;
-        pluto->i2c_adap.id = I2C_ALGO_BIT;
         pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL;
         pluto->i2c_adap.dev.parent = &pdev->dev;
         pluto->i2c_adap.algo_data = &pluto->i2c_bit;
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 11afec52f31f..7daf7b1598a0 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1523,7 +1523,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
 #endif
         ttusb->i2c_adap.algo              = &ttusb_dec_algo;
         ttusb->i2c_adap.algo_data         = NULL;
-        ttusb->i2c_adap.id                = I2C_ALGO_BIT;
 
         result = i2c_add_adapter(&ttusb->i2c_adap);
         if (result) {