Skip to content

Commit 84187df

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: mlxcpld: 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 <wsa+renesas@sang-engineering.com> Acked-by: Vadim Pasternak <vadimp@nvidia.com> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent d670ca5 commit 84187df

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/i2c/busses/i2c-mlxcpld.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ static int mlxcpld_i2c_check_status(struct mlxcpld_i2c_priv *priv, int *status)
197197
if (val & MLXCPLD_LPCI2C_TRANS_END) {
198198
if (val & MLXCPLD_LPCI2C_STATUS_NACK)
199199
/*
200-
* The slave is unable to accept the data. No such
201-
* slave, command not understood, or unable to accept
200+
* The target is unable to accept the data. No such
201+
* target, command not understood, or unable to accept
202202
* any more data.
203203
*/
204204
*status = MLXCPLD_LPCI2C_NACK_IND;
@@ -280,7 +280,7 @@ static int mlxcpld_i2c_wait_for_free(struct mlxcpld_i2c_priv *priv)
280280
}
281281

282282
/*
283-
* Wait for master transfer to complete.
283+
* Wait for transfer to complete.
284284
* It puts current process to sleep until we get interrupt or timeout expires.
285285
* Returns the number of transferred or read bytes or error (<0).
286286
*/
@@ -315,7 +315,7 @@ static int mlxcpld_i2c_wait_for_tc(struct mlxcpld_i2c_priv *priv)
315315
/*
316316
* Actual read data len will be always the same as
317317
* requested len. 0xff (line pull-up) will be returned
318-
* if slave has no data to return. Thus don't read
318+
* if target has no data to return. Thus don't read
319319
* MLXCPLD_LPCI2C_NUM_DAT_REG reg from CPLD. Only in case of
320320
* SMBus block read transaction data len can be different,
321321
* check this case.
@@ -375,7 +375,7 @@ static void mlxcpld_i2c_xfer_msg(struct mlxcpld_i2c_priv *priv)
375375
}
376376

377377
/*
378-
* Set target slave address with command for master transfer.
378+
* Set target address with command for transfer.
379379
* It should be latest executed function before CPLD transaction.
380380
*/
381381
cmd = (priv->xfer.msg[0].addr << 1) | priv->xfer.cmd;
@@ -449,8 +449,8 @@ static u32 mlxcpld_i2c_func(struct i2c_adapter *adap)
449449
}
450450

451451
static const struct i2c_algorithm mlxcpld_i2c_algo = {
452-
.master_xfer = mlxcpld_i2c_xfer,
453-
.functionality = mlxcpld_i2c_func
452+
.xfer = mlxcpld_i2c_xfer,
453+
.functionality = mlxcpld_i2c_func
454454
};
455455

456456
static const struct i2c_adapter_quirks mlxcpld_i2c_quirks = {

0 commit comments

Comments
 (0)