Message ID | 20240706112116.24543-48-wsa+renesas@sang-engineering.com |
---|---|
State | Accepted |
Delegated to: | Andi Shyti |
Headers | show |
Series | i2c: reword first drivers according to newest specification | expand |
Hi Wolfram, On Sat, Jul 06, 2024 at 01:20:47PM +0200, Wolfram Sang wrote: > 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 <wsa+renesas@sang-engineering.com> Acked-by: Alain Volmat <alain.volmat@foss.st.com> > --- > drivers/i2c/busses/i2c-stm32f4.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c > index f8b12be6ef55..230fff0c0bf9 100644 > --- a/drivers/i2c/busses/i2c-stm32f4.c > +++ b/drivers/i2c/busses/i2c-stm32f4.c > @@ -95,7 +95,7 @@ > > /** > * struct stm32f4_i2c_msg - client specific data > - * @addr: 8-bit slave addr, including r/w bit > + * @addr: 8-bit target addr, including r/w bit > * @count: number of bytes to be transferred > * @buf: data buffer > * @result: result of the transfer > @@ -480,7 +480,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) > > /** > * stm32f4_i2c_handle_rx_addr() - Handle address matched interrupt in case of > - * master receiver > + * controller receiver > * @i2c_dev: Controller's private data > */ > 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) > > /* > * Acknowledge failure: > - * In master transmitter mode a Stop must be generated by software > + * In controller transmitter mode a Stop must be generated by software > */ > if (status & STM32F4_I2C_SR1_AF) { > if (!(msg->addr & I2C_M_RD)) { > @@ -749,7 +749,7 @@ static u32 stm32f4_i2c_func(struct i2c_adapter *adap) > } > > static const struct i2c_algorithm stm32f4_i2c_algo = { > - .master_xfer = stm32f4_i2c_xfer, > + .xfer = stm32f4_i2c_xfer, > .functionality = stm32f4_i2c_func, > }; > > -- > 2.43.0 >
Hi All, Look good to me. Regards On 7/9/24 13:32, Alain Volmat wrote: > Hi Wolfram, > > On Sat, Jul 06, 2024 at 01:20:47PM +0200, Wolfram Sang wrote: >> 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 <wsa+renesas@sang-engineering.com> > > Acked-by: Alain Volmat <alain.volmat@foss.st.com> Acked-by: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com> > >> --- >> drivers/i2c/busses/i2c-stm32f4.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c >> index f8b12be6ef55..230fff0c0bf9 100644 >> --- a/drivers/i2c/busses/i2c-stm32f4.c >> +++ b/drivers/i2c/busses/i2c-stm32f4.c >> @@ -95,7 +95,7 @@ >> >> /** >> * struct stm32f4_i2c_msg - client specific data >> - * @addr: 8-bit slave addr, including r/w bit >> + * @addr: 8-bit target addr, including r/w bit >> * @count: number of bytes to be transferred >> * @buf: data buffer >> * @result: result of the transfer >> @@ -480,7 +480,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) >> >> /** >> * stm32f4_i2c_handle_rx_addr() - Handle address matched interrupt in case of >> - * master receiver >> + * controller receiver >> * @i2c_dev: Controller's private data >> */ >> 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) >> >> /* >> * Acknowledge failure: >> - * In master transmitter mode a Stop must be generated by software >> + * In controller transmitter mode a Stop must be generated by software >> */ >> if (status & STM32F4_I2C_SR1_AF) { >> if (!(msg->addr & I2C_M_RD)) { >> @@ -749,7 +749,7 @@ static u32 stm32f4_i2c_func(struct i2c_adapter *adap) >> } >> >> static const struct i2c_algorithm stm32f4_i2c_algo = { >> - .master_xfer = stm32f4_i2c_xfer, >> + .xfer = stm32f4_i2c_xfer, >> .functionality = stm32f4_i2c_func, >> }; >> >> -- >> 2.43.0 >>
Hi Wolfram, On Sat, Jul 06, 2024 at 01:20:47PM GMT, Wolfram Sang wrote: > 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 <wsa+renesas@sang-engineering.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Thanks, Andi
diff --git a/drivers/i2c/busses/i2c-stm32f4.c b/drivers/i2c/busses/i2c-stm32f4.c index f8b12be6ef55..230fff0c0bf9 100644 --- a/drivers/i2c/busses/i2c-stm32f4.c +++ b/drivers/i2c/busses/i2c-stm32f4.c @@ -95,7 +95,7 @@ /** * struct stm32f4_i2c_msg - client specific data - * @addr: 8-bit slave addr, including r/w bit + * @addr: 8-bit target addr, including r/w bit * @count: number of bytes to be transferred * @buf: data buffer * @result: result of the transfer @@ -480,7 +480,7 @@ static void stm32f4_i2c_handle_rx_done(struct stm32f4_i2c_dev *i2c_dev) /** * stm32f4_i2c_handle_rx_addr() - Handle address matched interrupt in case of - * master receiver + * controller receiver * @i2c_dev: Controller's private data */ 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) /* * Acknowledge failure: - * In master transmitter mode a Stop must be generated by software + * In controller transmitter mode a Stop must be generated by software */ if (status & STM32F4_I2C_SR1_AF) { if (!(msg->addr & I2C_M_RD)) { @@ -749,7 +749,7 @@ static u32 stm32f4_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm stm32f4_i2c_algo = { - .master_xfer = stm32f4_i2c_xfer, + .xfer = stm32f4_i2c_xfer, .functionality = stm32f4_i2c_func, };
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 <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-stm32f4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)