Skip to content

Commit 3900cf8

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: st: reword according to newest specification
Change the wording of this driver wrt. the newest I2C v7 and SMBus 3.2 specifications and replace "master/slave" with more appropriate terms. Signed-off-by: Wolfram Sang <[email protected]> Reviewed-by: Alain Volmat <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]>
1 parent 79e9df7 commit 3900cf8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/i2c/busses/i2c-st.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/*
33
* Copyright (C) 2013 STMicroelectronics
44
*
5-
* I2C master mode controller driver, used in STMicroelectronics devices.
5+
* I2C controller driver, used in STMicroelectronics devices.
66
*
77
* Author: Maxime Coquelin <[email protected]>
88
*/
@@ -150,7 +150,7 @@ struct st_i2c_timings {
150150

151151
/**
152152
* struct st_i2c_client - client specific data
153-
* @addr: 8-bit slave addr, including r/w bit
153+
* @addr: 8-bit target addr, including r/w bit
154154
* @count: number of bytes to be transfered
155155
* @xfered: number of bytes already transferred
156156
* @buf: data buffer
@@ -667,7 +667,7 @@ static int st_i2c_xfer_msg(struct st_i2c_dev *i2c_dev, struct i2c_msg *msg,
667667
i2c |= SSC_I2C_ACKG;
668668
st_i2c_set_bits(i2c_dev->base + SSC_I2C, i2c);
669669

670-
/* Write slave address */
670+
/* Write target address */
671671
st_i2c_write_tx_fifo(i2c_dev, c->addr);
672672

673673
/* Pre-fill Tx fifo with data in case of write */
@@ -766,7 +766,7 @@ static u32 st_i2c_func(struct i2c_adapter *adap)
766766
}
767767

768768
static const struct i2c_algorithm st_i2c_algo = {
769-
.master_xfer = st_i2c_xfer,
769+
.xfer = st_i2c_xfer,
770770
.functionality = st_i2c_func,
771771
};
772772

0 commit comments

Comments
 (0)