Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

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

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

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

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

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

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

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

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

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