[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, 3 insertions, 3 deletions

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 51b99cdbf29e..f0635b19de30 100644
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -276,9 +276,9 @@ static int tvmixer_clients(struct i2c_client *client)
 #else
         /* TV card ??? */
         switch (client->adapter->id) {
-        case I2C_ALGO_BIT | I2C_HW_SMBUS_VOODOO3:
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
-        case I2C_ALGO_BIT | I2C_HW_B_RIVA:
+        case I2C_HW_SMBUS_VOODOO3:
+        case I2C_HW_B_BT848:
+        case I2C_HW_B_RIVA:
                 /* ok, have a look ... */
                 break;
         default: