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

Merge the algorithm id part (16 upper bits) of the i2c adapters ids
into the definition of the adapters ids directly. After that, we don't
need to OR both ids together for each i2c_adapter structure.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index a28a395d6dfe..f1b1bb5acf70 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -618,8 +618,8 @@ static int tda9887_probe(struct i2c_adapter *adap)
                 return i2c_probe(adap, &addr_data, tda9887_attach);
 #else
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
         case I2C_ALGO_SAA7134:
                 return i2c_probe(adap, &addr_data, tda9887_attach);
                 break;