| Message ID | 20240322132619.6389-36-wsa+renesas@sang-engineering.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | i2c: reword i2c_algorithm according to newest specification | expand |
> -----Original Message----- > From: Wolfram Sang <wsa+renesas@sang-engineering.com> > Sent: Friday, 22 March 2024 15:25 > To: linux-i2c@vger.kernel.org > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>; Vadim Pasternak > <vadimp@nvidia.com>; Michael Shych <michaelsh@nvidia.com>; Andi Shyti > <andi.shyti@kernel.org>; linux-kernel@vger.kernel.org > Subject: [PATCH 35/64] i2c: mlxcpld: reword according to newest specification > > Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C > specifications and replace "master/slave" with more appropriate terms. > They are also more specific because we distinguish now between a remote > entity ("client") and a local one ("target"). > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Acked-by: Vadim Pasternak <vadimp@nvidia.com> > --- > drivers/i2c/busses/i2c-mlxcpld.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c- > mlxcpld.c > index 099291a0411d..786d4c51f65a 100644 > --- a/drivers/i2c/busses/i2c-mlxcpld.c > +++ b/drivers/i2c/busses/i2c-mlxcpld.c > @@ -197,8 +197,8 @@ static int mlxcpld_i2c_check_status(struct > mlxcpld_i2c_priv *priv, int *status) > if (val & MLXCPLD_LPCI2C_TRANS_END) { > if (val & MLXCPLD_LPCI2C_STATUS_NACK) > /* > - * The slave is unable to accept the data. No such > - * slave, command not understood, or unable to > accept > + * The client is unable to accept the data. No such > + * client, command not understood, or unable to > accept > * any more data. > */ > *status = MLXCPLD_LPCI2C_NACK_IND; > @@ -280,7 +280,7 @@ static int mlxcpld_i2c_wait_for_free(struct > mlxcpld_i2c_priv *priv) } > > /* > - * Wait for master transfer to complete. > + * Wait for host transfer to complete. > * It puts current process to sleep until we get interrupt or timeout expires. > * Returns the number of transferred or read bytes or error (<0). > */ > @@ -315,7 +315,7 @@ static int mlxcpld_i2c_wait_for_tc(struct > mlxcpld_i2c_priv *priv) > /* > * Actual read data len will be always the same as > * requested len. 0xff (line pull-up) will be returned > - * if slave has no data to return. Thus don't read > + * if client has no data to return. Thus don't read > * MLXCPLD_LPCI2C_NUM_DAT_REG reg from CPLD. Only in > case of > * SMBus block read transaction data len can be different, > * check this case. > @@ -375,7 +375,7 @@ static void mlxcpld_i2c_xfer_msg(struct > mlxcpld_i2c_priv *priv) > } > > /* > - * Set target slave address with command for master transfer. > + * Set client address with command for host transfer. > * It should be latest executed function before CPLD transaction. > */ > cmd = (priv->xfer.msg[0].addr << 1) | priv->xfer.cmd; @@ -449,7 > +449,7 @@ static u32 mlxcpld_i2c_func(struct i2c_adapter *adap) } > > static const struct i2c_algorithm mlxcpld_i2c_algo = { > - .master_xfer = mlxcpld_i2c_xfer, > + .xfer = mlxcpld_i2c_xfer, > .functionality = mlxcpld_i2c_func > }; > > -- > 2.43.0
diff --git a/drivers/i2c/busses/i2c-mlxcpld.c b/drivers/i2c/busses/i2c-mlxcpld.c index 099291a0411d..786d4c51f65a 100644 --- a/drivers/i2c/busses/i2c-mlxcpld.c +++ b/drivers/i2c/busses/i2c-mlxcpld.c @@ -197,8 +197,8 @@ static int mlxcpld_i2c_check_status(struct mlxcpld_i2c_priv *priv, int *status) if (val & MLXCPLD_LPCI2C_TRANS_END) { if (val & MLXCPLD_LPCI2C_STATUS_NACK) /* - * The slave is unable to accept the data. No such - * slave, command not understood, or unable to accept + * The client is unable to accept the data. No such + * client, command not understood, or unable to accept * any more data. */ *status = MLXCPLD_LPCI2C_NACK_IND; @@ -280,7 +280,7 @@ static int mlxcpld_i2c_wait_for_free(struct mlxcpld_i2c_priv *priv) } /* - * Wait for master transfer to complete. + * Wait for host transfer to complete. * It puts current process to sleep until we get interrupt or timeout expires. * Returns the number of transferred or read bytes or error (<0). */ @@ -315,7 +315,7 @@ static int mlxcpld_i2c_wait_for_tc(struct mlxcpld_i2c_priv *priv) /* * Actual read data len will be always the same as * requested len. 0xff (line pull-up) will be returned - * if slave has no data to return. Thus don't read + * if client has no data to return. Thus don't read * MLXCPLD_LPCI2C_NUM_DAT_REG reg from CPLD. Only in case of * SMBus block read transaction data len can be different, * check this case. @@ -375,7 +375,7 @@ static void mlxcpld_i2c_xfer_msg(struct mlxcpld_i2c_priv *priv) } /* - * Set target slave address with command for master transfer. + * Set client address with command for host transfer. * It should be latest executed function before CPLD transaction. */ cmd = (priv->xfer.msg[0].addr << 1) | priv->xfer.cmd; @@ -449,7 +449,7 @@ static u32 mlxcpld_i2c_func(struct i2c_adapter *adap) } static const struct i2c_algorithm mlxcpld_i2c_algo = { - .master_xfer = mlxcpld_i2c_xfer, + .xfer = mlxcpld_i2c_xfer, .functionality = mlxcpld_i2c_func };
Match the wording of this driver wrt. the newest I2C v7, SMBus 3.2, I3C specifications and replace "master/slave" with more appropriate terms. They are also more specific because we distinguish now between a remote entity ("client") and a local one ("target"). Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/busses/i2c-mlxcpld.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)