diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-08-11 17:38:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-05 12:14:29 -0400 |
commit | 87c3d7a8bc0ff5c8d4481e509b407b6be1859925 (patch) | |
tree | 73fadb7bdd87a054cf3131b541af4216ba545755 /drivers/i2c | |
parent | e51cc6b3a365e170d3ebe51c2308fdd42e027a46 (diff) |
[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.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-ite.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pca.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-pcf.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sgi.c | 2 | ||||
-rw-r--r-- | drivers/i2c/algos/i2c-algo-sibyte.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 2 |
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 6e1e1601accb..b8767382bbac 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) | |||
541 | 541 | ||
542 | /* register new adapter to i2c module... */ | 542 | /* register new adapter to i2c module... */ |
543 | 543 | ||
544 | adap->id |= i2c_bit_algo.id; | 544 | adap->id |= I2C_ALGO_BIT; |
545 | adap->algo = &i2c_bit_algo; | 545 | adap->algo = &i2c_bit_algo; |
546 | 546 | ||
547 | adap->timeout = 100; /* default values, should */ | 547 | 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 a9c2b1115e07..6cb02f685db3 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) | |||
738 | 738 | ||
739 | /* register new adapter to i2c module... */ | 739 | /* register new adapter to i2c module... */ |
740 | 740 | ||
741 | adap->id |= iic_algo.id; | 741 | adap->id |= I2C_ALGO_IIC; |
742 | adap->algo = &iic_algo; | 742 | adap->algo = &iic_algo; |
743 | 743 | ||
744 | adap->timeout = 100; /* default values, should */ | 744 | 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 16157391cdf5..79b3c2edcf08 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) | |||
371 | 371 | ||
372 | /* register new adapter to i2c module... */ | 372 | /* register new adapter to i2c module... */ |
373 | 373 | ||
374 | adap->id |= pca_algo.id; | 374 | adap->id |= I2C_ALGO_PCA; |
375 | adap->algo = &pca_algo; | 375 | adap->algo = &pca_algo; |
376 | 376 | ||
377 | adap->timeout = 100; /* default values, should */ | 377 | 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 eb3e9e39d75b..fbc0b87fe070 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) | |||
476 | 476 | ||
477 | /* register new adapter to i2c module... */ | 477 | /* register new adapter to i2c module... */ |
478 | 478 | ||
479 | adap->id |= pcf_algo.id; | 479 | adap->id |= I2C_ALGO_PCF; |
480 | adap->algo = &pcf_algo; | 480 | adap->algo = &pcf_algo; |
481 | 481 | ||
482 | adap->timeout = 100; /* default values, should */ | 482 | 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 55284c9e41dc..8863a671d977 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 = { | |||
168 | */ | 168 | */ |
169 | int i2c_sgi_add_bus(struct i2c_adapter *adap) | 169 | int i2c_sgi_add_bus(struct i2c_adapter *adap) |
170 | { | 170 | { |
171 | adap->id |= sgi_algo.id; | 171 | adap->id |= I2C_ALGO_SGI; |
172 | adap->algo = &sgi_algo; | 172 | adap->algo = &sgi_algo; |
173 | 173 | ||
174 | return i2c_add_adapter(adap); | 174 | return i2c_add_adapter(adap); |
diff --git a/drivers/i2c/algos/i2c-algo-sibyte.c b/drivers/i2c/algos/i2c-algo-sibyte.c index 4ca3e69461bc..6cda0a6332d9 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) | |||
151 | 151 | ||
152 | /* register new adapter to i2c module... */ | 152 | /* register new adapter to i2c module... */ |
153 | 153 | ||
154 | i2c_adap->id |= i2c_sibyte_algo.id; | 154 | i2c_adap->id |= I2C_ALGO_SIBYTE; |
155 | i2c_adap->algo = &i2c_sibyte_algo; | 155 | i2c_adap->algo = &i2c_sibyte_algo; |
156 | 156 | ||
157 | /* Set the frequency to 100 kHz */ | 157 | /* 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 1a3366287087..ade9b14e6840 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){ | |||
726 | adap = &dev->adap; | 726 | adap = &dev->adap; |
727 | strcpy(adap->name, "IBM IIC"); | 727 | strcpy(adap->name, "IBM IIC"); |
728 | i2c_set_adapdata(adap, dev); | 728 | i2c_set_adapdata(adap, dev); |
729 | adap->id = I2C_HW_OCP | iic_algo.id; | 729 | adap->id = I2C_ALGO_OCP | I2C_HW_OCP; |
730 | adap->algo = &iic_algo; | 730 | adap->algo = &iic_algo; |
731 | adap->client_register = NULL; | 731 | adap->client_register = NULL; |
732 | adap->client_unregister = NULL; | 732 | adap->client_unregister = NULL; |