aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-08-11 23:38:52 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-05 09:14:29 -0700
commit87c3d7a8bc0ff5c8d4481e509b407b6be1859925 (patch)
tree73fadb7bdd87a054cf3131b541af4216ba545755 /drivers/i2c
parente51cc6b3a365e170d3ebe51c2308fdd42e027a46 (diff)
downloadlinux-87c3d7a8bc0ff5c8d4481e509b407b6be1859925.tar.gz
[PATCH] I2C: Kill i2c_algorithm.id (3/7)
Don't rely on i2c_algorithm.id to alter the i2c adapter's id, use the I2C_ALGO_* value directly instead, because i2c_algorithm will soon have no id member no more. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/algos/i2c-algo-bit.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-ite.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pcf.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-sgi.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-sibyte.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 6e1e1601accb2e..b8767382bbacbf 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -541,7 +541,7 @@ int i2c_bit_add_bus(struct i2c_adapter *adap)
/* register new adapter to i2c module... */
- adap->id |= i2c_bit_algo.id;
+ 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 a9c2b1115e0783..6cb02f685db3fd 100644
--- a/drivers/i2c/algos/i2c-algo-ite.c
+++ b/drivers/i2c/algos/i2c-algo-ite.c
@@ -738,7 +738,7 @@ int i2c_iic_add_bus(struct i2c_adapter *adap)
/* register new adapter to i2c module... */
- adap->id |= iic_algo.id;
+ 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 16157391cdf5e1..79b3c2edcf08e3 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -371,7 +371,7 @@ int i2c_pca_add_bus(struct i2c_adapter *adap)
/* register new adapter to i2c module... */
- adap->id |= pca_algo.id;
+ 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 eb3e9e39d75bc7..fbc0b87fe070d5 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -476,7 +476,7 @@ int i2c_pcf_add_bus(struct i2c_adapter *adap)
/* register new adapter to i2c module... */
- adap->id |= pcf_algo.id;
+ 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 55284c9e41dc60..8863a671d97713 100644
--- a/drivers/i2c/algos/i2c-algo-sgi.c
+++ b/drivers/i2c/algos/i2c-algo-sgi.c
@@ -168,7 +168,7 @@ static struct i2c_algorithm sgi_algo = {
*/
int i2c_sgi_add_bus(struct i2c_adapter *adap)
{
- adap->id |= sgi_algo.id;
+ 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 4ca3e69461bc23..6cda0a6332d997 100644
--- a/drivers/i2c/algos/i2c-algo-sibyte.c
+++ b/drivers/i2c/algos/i2c-algo-sibyte.c
@@ -151,7 +151,7 @@ int i2c_sibyte_add_bus(struct i2c_adapter *i2c_adap, int speed)
/* register new adapter to i2c module... */
- i2c_adap->id |= i2c_sibyte_algo.id;
+ 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 1a3366287087d8..ade9b14e6840b8 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -726,7 +726,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_HW_OCP | iic_algo.id;
+ adap->id = I2C_ALGO_OCP | I2C_HW_OCP;
adap->algo = &iic_algo;
adap->client_register = NULL;
adap->client_unregister = NULL;