[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>

25 files changed, 30 insertions, 41 deletions

diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 6060b10ab0ce..df05df1a0ef6 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -539,8 +539,6 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= I2C_ALGO_BIT;
         adap->algo = &i2c_bit_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-ite.c b/drivers/i2c/algos/i2c-algo-ite.c
index b460e57216e1..2db7bfc85225 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -736,8 +736,6 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
                     adap->name));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= I2C_ALGO_IIC;
         adap->algo = &iic_algo;
 
         adap->timeout = 100;    /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index be2c8abc6682..beb10edfe9c1 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -369,8 +369,6 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
         int rval;
 
         /* register new adapter to i2c module... */
-
-        adap->id |= I2C_ALGO_PCA;
         adap->algo = &pca_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index 95f023ad8c62..6e498df1f717 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -474,8 +474,6 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
         DEB2(dev_dbg(&adap->dev, "hw routines registered.\n"));
 
         /* register new adapter to i2c module... */
-
-        adap->id |= I2C_ALGO_PCF;
         adap->algo = &pcf_algo;
 
         adap->timeout = 100;            /* default values, should       */
diff --git a/drivers/i2c/algos/i2c-algo-sgi.c b/drivers/i2c/algos/i2c-algo-sgi.c
index 142505105d6f..2f8df81317ff 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -167,7 +167,6 @@ static struct i2c_algorithm sgi_algo = {
  */
 int i2c_sgi_add_bus(struct i2c_adapter *adap)
 {
-        adap->id |= I2C_ALGO_SGI;
         adap->algo = &sgi_algo;
 
         return i2c_add_adapter(adap);
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c
index c01108ae7b69..8ed5ad12552f 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -149,8 +149,6 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
         struct i2c_algo_sibyte_data *adap = i2c_adap->algo_data;
 
         /* register new adapter to i2c module... */
-
-        i2c_adap->id |= I2C_ALGO_SIBYTE;
         i2c_adap->algo = &i2c_sibyte_algo;
         
         /* Set the frequency to 100 kHz */
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index f42ab909eb78..a3ed9590f028 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -725,7 +725,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
         adap = &dev->adap;
         strcpy(adap->name, "IBM IIC");
         i2c_set_adapdata(adap, dev);
-        adap->id = I2C_ALGO_OCP | I2C_HW_OCP;
+        adap->id = I2C_HW_OCP;
         adap->algo = &iic_algo;
         adap->client_register = NULL;
         adap->client_unregister = NULL;
diff --git a/drivers/i2c/busses/i2c-isa.c b/drivers/i2c/busses/i2c-isa.c
index baae5dbc198e..bdc6806dafae 100644
--- a/drivers/i2c/busses/i2c-isa.c
+++ b/drivers/i2c/busses/i2c-isa.c
@@ -49,7 +49,7 @@ static struct i2c_algorithm isa_algorithm = {
 /* There can only be one... */
 static struct i2c_adapter isa_adapter = {
         .owner          = THIS_MODULE,
-        .id             = I2C_ALGO_ISA | I2C_HW_ISA,
+        .id             = I2C_HW_ISA,
         .class          = I2C_CLASS_HWMON,
         .algo           = &isa_algorithm,
         .name           = "ISA main adapter",
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 70c5ffaee6a3..f065583ddcf1 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -279,7 +279,7 @@ static struct i2c_algorithm mpc_algo = {
 static struct i2c_adapter mpc_ops = {
         .owner = THIS_MODULE,
         .name = "MPC adapter",
-        .id = I2C_ALGO_MPC107 | I2C_HW_MPC107,
+        .id = I2C_HW_MPC107,
         .algo = &mpc_algo,
         .class = I2C_CLASS_HWMON,
         .timeout = 1,
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 6e5dd4949237..eb6cc0869938 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -521,7 +521,7 @@ mv64xxx_i2c_probe(struct device *dev)
         drv_data->freq_m = pdata->freq_m;
         drv_data->freq_n = pdata->freq_n;
         drv_data->irq = platform_get_irq(pd, 0);
-        drv_data->adapter.id = I2C_ALGO_MV64XXX | I2C_HW_MV64XXX;
+        drv_data->adapter.id = I2C_HW_MV64XXX;
         drv_data->adapter.algo = &mv64xxx_i2c_algo;
         drv_data->adapter.owner = THIS_MODULE;
         drv_data->adapter.class = I2C_CLASS_HWMON;
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index a070417e65e6..67ffed8a7fea 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -188,7 +188,7 @@ static int bt832_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, bt832_attach);
 #endif
         return 0;
diff --git a/drivers/media/video/bttv-i2c.c b/drivers/media/video/bttv-i2c.c
index 82beb5a8a59c..1db95f75ac68 100644
--- a/drivers/media/video/bttv-i2c.c
+++ b/drivers/media/video/bttv-i2c.c
@@ -281,7 +281,7 @@ static struct i2c_adapter bttv_i2c_adap_hw_template = {
         .class         = I2C_CLASS_TV_ANALOG,
 #endif
         I2C_DEVNAME("bt878"),
-        .id            = I2C_ALGO_BIT | I2C_HW_B_BT848 /* FIXME */,
+        .id            = I2C_HW_B_BT848 /* FIXME */,
         .algo          = &bttv_algo,
         .client_register = attach_inform,
 };
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9fc5055e001c..c2f32d522668 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -429,7 +429,7 @@ static int ir_probe(struct i2c_adapter *adap)
         struct i2c_client c; char buf; int i,rc;
 
         switch (adap->id) {
-        case I2C_ALGO_BIT | I2C_HW_B_BT848:
+        case I2C_HW_B_BT848:
                 probe = probe_bttv;
                 break;
         case I2C_ALGO_SAA7134:
diff --git a/drivers/media/video/ovcamchip/ov6x20.c b/drivers/media/video/ovcamchip/ov6x20.c
index 3433619ad93f..b3f4d266cede 100644
--- a/drivers/media/video/ovcamchip/ov6x20.c
+++ b/drivers/media/video/ovcamchip/ov6x20.c
@@ -164,10 +164,10 @@ static int ov6x20_init(struct i2c_client *c)
         DDEBUG(4, &c->dev, "entered");
 
         switch (c->adapter->id) {
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV511:
                 rc = ov_write_regvals(c, regvals_init_6x20_511);
                 break;
-        case I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OV518:
                 rc = ov_write_regvals(c, regvals_init_6x20_518);
                 break;
         default:
@@ -338,7 +338,7 @@ static int ov6x20_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         /* OV518 needs 8 bit multiplexed in color mode, and 16 bit in B&W */
-        if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+        if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                 if (win->format == VIDEO_PALETTE_GREY)
                         ov_write_mask(c, 0x13, 0x00, 0x20);
                 else
diff --git a/drivers/media/video/ovcamchip/ov6x30.c b/drivers/media/video/ovcamchip/ov6x30.c
index 44a842379b45..6eab458ab792 100644
--- a/drivers/media/video/ovcamchip/ov6x30.c
+++ b/drivers/media/video/ovcamchip/ov6x30.c
@@ -301,7 +301,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
         /******** Palette-specific regs ********/
 
         if (win->format == VIDEO_PALETTE_GREY) {
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we're already in 8-bit mode */
                 } else {
                         ov_write_mask(c, 0x13, 0x20, 0x20);
@@ -313,7 +313,7 @@ static int ov6x30_mode_init(struct i2c_client *c, struct ovcamchip_window *win)
                  * Therefore, the OV6630 needs to be in 8-bit multiplexed
                  * output mode */
 
-                if (c->adapter->id == (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518)) {
+                if (c->adapter->id == I2C_HW_SMBUS_OV518) {
                         /* Do nothing - we want to stay in 8-bit mode */
                         /* Warning: Messing with reg 0x13 breaks OV518 color */
                 } else {
diff --git a/drivers/media/video/ovcamchip/ovcamchip_core.c b/drivers/media/video/ovcamchip/ovcamchip_core.c
index 54dd5612d3b8..b98c64ab7c58 100644
--- a/drivers/media/video/ovcamchip/ovcamchip_core.c
+++ b/drivers/media/video/ovcamchip/ovcamchip_core.c
@@ -296,10 +296,10 @@ static int ovcamchip_attach(struct i2c_adapter *adap)
          * attach to adapters that are known to contain OV camera chips. */
 
         switch (adap->id) {
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV511):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OV518):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_OVFX2):
-        case (I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF):
+        case I2C_HW_SMBUS_OV511:
+        case I2C_HW_SMBUS_OV518:
+        case I2C_HW_SMBUS_OVFX2:
+        case I2C_HW_SMBUS_W9968CF:
                 PDEBUG(1, "Adapter ID 0x%06x accepted", adap->id);
                 break;
         default:
diff --git a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
index 7cb1fb3e66f9..bc6b6c0cea6d 100644
--- a/drivers/media/video/tda7432.c
+++ b/drivers/media/video/tda7432.c
@@ -328,7 +328,7 @@ static int tda7432_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda7432_attach);
 #endif
         return 0;
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 566e1a5ca135..3eaf2e1211e5 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -262,7 +262,7 @@ static int tda9875_probe(struct i2c_adapter *adap)
         if (adap->class & I2C_CLASS_TV_ANALOG)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #else
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adap->id == I2C_HW_B_BT848)
                 return i2c_probe(adap, &addr_data, tda9875_attach);
 #endif
         return 0;
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;
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
index 103def1abe3c..79203595b9c1 100644
--- a/drivers/media/video/tuner-3036.c
+++ b/drivers/media/video/tuner-3036.c
@@ -165,7 +165,7 @@ static int
 tuner_probe(struct i2c_adapter *adap)
 {
         this_adap = 0;
-        if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_LP))
+        if (adap->id == I2C_HW_B_LP)
                 return i2c_probe(adap, &addr_data, tuner_attach);
         return 0;
 }
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index f42a1efa8fcf..9420b5f52915 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1098,7 +1098,7 @@ static int tda8425_initialize(struct CHIPSTATE *chip)
                             /* extern   */ TDA8425_S1_CH1, /* intern */ TDA8425_S1_OFF,
                             /* off      */ TDA8425_S1_OFF, /* on     */ TDA8425_S1_CH2};
 
-        if (chip->c.adapter->id == (I2C_ALGO_BIT | I2C_HW_B_RIVA)) {
+        if (chip->c.adapter->id == I2C_HW_B_RIVA) {
                 memcpy (desc->inputmap, inputmap, sizeof (inputmap));
         }
         return 0;
@@ -1555,8 +1555,8 @@ static int chip_probe(struct i2c_adapter *adap)
                 return i2c_probe(adap, &addr_data, chip_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, chip_attach);
         }
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 127ec38ebd60..3c3356a01cc6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -534,7 +534,7 @@ static int
 tveeprom_attach_adapter (struct i2c_adapter *adapter)
 {
         dprintk(1,"%s: id 0x%x\n",__FUNCTION__,adapter->id);
-        if (adapter->id != (I2C_ALGO_BIT | I2C_HW_B_BT848))
+        if (adapter->id != I2C_HW_B_BT848)
                 return 0;
         return i2c_probe(adapter, &addr_data, tveeprom_detect_client);
 }
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:
diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index 908cfdf17039..83e8dd627154 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1579,7 +1579,7 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
         };
 
         static struct i2c_adapter adap = {
-                .id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
+                .id =                I2C_HW_SMBUS_W9968CF,
                 .class =             I2C_CLASS_CAM_DIGITAL,
                 .owner =             THIS_MODULE,
                 .client_register =   w9968cf_i2c_attach_inform,
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index 67f85344f0cc..ad60bbb16cdf 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1271,7 +1271,7 @@ ERROR0:;
 }
 
 static int maven_attach_adapter(struct i2c_adapter* adapter) {
-        if (adapter->id == (I2C_ALGO_BIT | I2C_HW_B_G400))
+        if (adapter->id == I2C_HW_B_G400)
                 return i2c_probe(adapter, &addr_data, &maven_detect_client);
         return 0;
 }