Skip to content

Commit 614b1c3

Browse files
author
Wolfram Sang
committed
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: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 19272b3 commit 614b1c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+101
-101
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,8 @@ static u32 bit_func(struct i2c_adapter *adap)
619619
/* -----exported algorithm data: ------------------------------------- */
620620

621621
const struct i2c_algorithm i2c_bit_algo = {
622-
.master_xfer = bit_xfer,
623-
.master_xfer_atomic = bit_xfer_atomic,
622+
.xfer = bit_xfer,
623+
.xfer_atomic = bit_xfer_atomic,
624624
.functionality = bit_func,
625625
};
626626
EXPORT_SYMBOL(i2c_bit_algo);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,8 @@ static u32 pca_func(struct i2c_adapter *adap)
361361
}
362362

363363
static const struct i2c_algorithm pca_algo = {
364-
.master_xfer = pca_xfer,
365-
.functionality = pca_func,
364+
.xfer = pca_xfer,
365+
.functionality = pca_func,
366366
};
367367

368368
static unsigned int pca_probe_chip(struct i2c_adapter *adap)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ static u32 pcf_func(struct i2c_adapter *adap)
389389

390390
/* exported algorithm data: */
391391
static const struct i2c_algorithm pcf_algo = {
392-
.master_xfer = pcf_xfer,
393-
.functionality = pcf_func,
392+
.xfer = pcf_xfer,
393+
.functionality = pcf_func,
394394
};
395395

396396
/*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ static u32 i2c_amd_func(struct i2c_adapter *a)
179179
}
180180

181181
static const struct i2c_algorithm i2c_amd_algorithm = {
182-
.master_xfer = i2c_amd_xfer,
182+
.xfer = i2c_amd_xfer,
183183
.functionality = i2c_amd_func,
184184
};
185185

‎drivers/i2c/busses/i2c-aspeed.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -814,11 +814,11 @@ static int aspeed_i2c_unreg_slave(struct i2c_client *client)
814814
#endif /* CONFIG_I2C_SLAVE */
815815

816816
static const struct i2c_algorithm aspeed_i2c_algo = {
817-
.master_xfer = aspeed_i2c_master_xfer,
818-
.functionality = aspeed_i2c_functionality,
817+
.xfer = aspeed_i2c_master_xfer,
818+
.functionality = aspeed_i2c_functionality,
819819
#if IS_ENABLED(CONFIG_I2C_SLAVE)
820-
.reg_slave = aspeed_i2c_reg_slave,
821-
.unreg_slave = aspeed_i2c_unreg_slave,
820+
.reg_slave = aspeed_i2c_reg_slave,
821+
.unreg_slave = aspeed_i2c_unreg_slave,
822822
#endif /* CONFIG_I2C_SLAVE */
823823
};
824824

‎drivers/i2c/busses/i2c-at91-master.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,8 @@ static u32 at91_twi_func(struct i2c_adapter *adapter)
739739
}
740740

741741
static const struct i2c_algorithm at91_twi_algorithm = {
742-
.master_xfer = at91_twi_xfer,
743-
.functionality = at91_twi_func,
742+
.xfer = at91_twi_xfer,
743+
.functionality = at91_twi_func,
744744
};
745745

746746
static int at91_twi_configure_dma(struct at91_twi_dev *dev, u32 phy_addr)

‎drivers/i2c/busses/i2c-axxia.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ static int axxia_i2c_unreg_slave(struct i2c_client *slave)
706706
}
707707

708708
static const struct i2c_algorithm axxia_i2c_algo = {
709-
.master_xfer = axxia_i2c_xfer,
709+
.xfer = axxia_i2c_xfer,
710710
.functionality = axxia_i2c_func,
711711
.reg_slave = axxia_i2c_reg_slave,
712712
.unreg_slave = axxia_i2c_unreg_slave,

‎drivers/i2c/busses/i2c-bcm-iproc.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ static int bcm_iproc_i2c_unreg_slave(struct i2c_client *slave)
10411041
}
10421042

10431043
static struct i2c_algorithm bcm_iproc_algo = {
1044-
.master_xfer = bcm_iproc_i2c_xfer,
1044+
.xfer = bcm_iproc_i2c_xfer,
10451045
.functionality = bcm_iproc_i2c_functionality,
10461046
.reg_slave = bcm_iproc_i2c_reg_slave,
10471047
.unreg_slave = bcm_iproc_i2c_unreg_slave,

‎drivers/i2c/busses/i2c-cadence.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,12 +1231,12 @@ static int cdns_unreg_slave(struct i2c_client *slave)
12311231
#endif
12321232

12331233
static const struct i2c_algorithm cdns_i2c_algo = {
1234-
.master_xfer = cdns_i2c_master_xfer,
1235-
.master_xfer_atomic = cdns_i2c_master_xfer_atomic,
1236-
.functionality = cdns_i2c_func,
1234+
.xfer = cdns_i2c_master_xfer,
1235+
.xfer_atomic = cdns_i2c_master_xfer_atomic,
1236+
.functionality = cdns_i2c_func,
12371237
#if IS_ENABLED(CONFIG_I2C_SLAVE)
1238-
.reg_slave = cdns_reg_slave,
1239-
.unreg_slave = cdns_unreg_slave,
1238+
.reg_slave = cdns_reg_slave,
1239+
.unreg_slave = cdns_unreg_slave,
12401240
#endif
12411241
};
12421242

‎drivers/i2c/busses/i2c-cgbc.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ static u32 cgbc_i2c_func(struct i2c_adapter *adap)
331331
}
332332

333333
static const struct i2c_algorithm cgbc_i2c_algorithm = {
334-
.master_xfer = cgbc_i2c_xfer,
335-
.functionality = cgbc_i2c_func,
334+
.xfer = cgbc_i2c_xfer,
335+
.functionality = cgbc_i2c_func,
336336
};
337337

338338
static struct i2c_algo_cgbc_data cgbc_i2c_algo_data[] = {

0 commit comments

Comments
 (0)