Commit 614b1c3c authored by Wolfram Sang's avatar Wolfram Sang
Browse files

i2c: use inclusive callbacks in struct i2c_algorithm 



Convert the I2C subsystem to drop using the 'master_'-prefixed callbacks
in favor of the simplified ones. Fix alignment of '=' while here.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent 19272b37

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

+2 −2
Original line number Diff line number Diff line
@@ -619,8 +619,8 @@ static u32 bit_func(struct i2c_adapter *adap) 
/* -----exported algorithm data: -------------------------------------	*/



const struct i2c_algorithm i2c_bit_algo = {

	.master_xfer = bit_xfer,

	.master_xfer_atomic = bit_xfer_atomic,

	.xfer = bit_xfer,

	.xfer_atomic = bit_xfer_atomic,

	.functionality = bit_func,

};

EXPORT_SYMBOL(i2c_bit_algo);

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

+2 −2
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ static u32 pca_func(struct i2c_adapter *adap) 
}



static const struct i2c_algorithm pca_algo = {

	.master_xfer	= pca_xfer,

	.xfer = pca_xfer,

	.functionality = pca_func,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static u32 pcf_func(struct i2c_adapter *adap) 


/* exported algorithm data: */

static const struct i2c_algorithm pcf_algo = {

	.master_xfer	= pcf_xfer,

	.xfer = pcf_xfer,

	.functionality = pcf_func,

};

drivers/i2c/busses/i2c-amd-mp2-plat.c

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static u32 i2c_amd_func(struct i2c_adapter *a) 
}



static const struct i2c_algorithm i2c_amd_algorithm = {

	.master_xfer = i2c_amd_xfer,

	.xfer = i2c_amd_xfer,

	.functionality = i2c_amd_func,

};

drivers/i2c/busses/i2c-aspeed.c

+4 −4
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ static int aspeed_i2c_unreg_slave(struct i2c_client *client) 
#endif /* CONFIG_I2C_SLAVE */



static const struct i2c_algorithm aspeed_i2c_algo = {

	.master_xfer	= aspeed_i2c_master_xfer,

	.xfer = aspeed_i2c_master_xfer,

	.functionality = aspeed_i2c_functionality,

#if IS_ENABLED(CONFIG_I2C_SLAVE)

	.reg_slave = aspeed_i2c_reg_slave,