Commit 87c3d7a8 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e51cc6b3

drivers/i2c/algos/i2c-algo-bit.c

+1 −1
Original line number Diff line number Diff line
@@ -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	*/

drivers/i2c/algos/i2c-algo-ite.c

+1 −1
Original line number Diff line number Diff line
@@ -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	*/

drivers/i2c/algos/i2c-algo-pca.c

+1 −1
Original line number Diff line number Diff line
@@ -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	*/

drivers/i2c/algos/i2c-algo-pcf.c

+1 −1
Original line number Diff line number Diff line
@@ -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	*/

drivers/i2c/algos/i2c-algo-sgi.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE