openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Jean Delvare 2005-08-11 23:38:52 +02:00 committed by Greg Kroah-Hartman
parent e51cc6b3a3
commit 87c3d7a8bc
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/i2c/algos/i2c-algo-bit.c
View File

@ -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 */

2
drivers/i2c/algos/i2c-algo-ite.c
View File

@ -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 */

2
drivers/i2c/algos/i2c-algo-pca.c
View File

@ -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 */

2
drivers/i2c/algos/i2c-algo-pcf.c
View File

@ -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 */

2
drivers/i2c/algos/i2c-algo-sgi.c
View File

@ -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);

2
drivers/i2c/algos/i2c-algo-sibyte.c
View File

@ -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 */

2
drivers/i2c/busses/i2c-ibm_iic.c
View File

@ -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;