Skip to content

Commit 830f70c

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: stm32f4: 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]> Acked-by: Alain Volmat <[email protected]> Acked-by: Pierre-Yves MORDRET <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]>
1 parent 5627f15 commit 830f70c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/i2c/busses/i2c-stm32f4.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595

9696
/**
9797
* struct stm32f4_i2c_msg - client specific data
98-
* @addr: 8-bit slave addr, including r/w bit
98+
* @addr: 8-bit target addr, including r/w bit
9999
* @count: number of bytes to be transferred
100100
* @buf: data buffer
101101
* @result: result of the transfer
@@ -480,7 +480,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev)
480480

481481
/**
482482
* stm32f4_i2c_handle_rx_addr() - Handle address matched interrupt in case of
483-
* master receiver
483+
* controller receiver
484484
* @i2c_dev: Controller's private data
485485
*/
486486
static void stm32f4_i2c_handle_rx_addr(struct stm32f4_i2c_dev *i2c_dev)
@@ -643,7 +643,7 @@ static irqreturn_t stm32f4_i2c_isr_error(int irq, void *data)
643643

644644
/*
645645
* Acknowledge failure:
646-
* In master transmitter mode a Stop must be generated by software
646+
* In controller transmitter mode a Stop must be generated by software
647647
*/
648648
if (status & STM32F4_I2C_SR1_AF) {
649649
if (!(msg->addr & I2C_M_RD)) {
@@ -749,7 +749,7 @@ static u32 stm32f4_i2c_func(struct i2c_adapter *adap)
749749
}
750750

751751
static const struct i2c_algorithm stm32f4_i2c_algo = {
752-
.master_xfer = stm32f4_i2c_xfer,
752+
.xfer = stm32f4_i2c_xfer,
753753
.functionality = stm32f4_i2c_func,
754754
};
755755

0 commit comments

Comments
 (0)