Skip to content

Commit 3fdf633

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: mv64xxx: 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> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
1 parent 839052d commit 3fdf633

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

drivers/i2c/busses/i2c-mv64xxx.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ enum {
8989
MV64XXX_I2C_STATE_WAITING_FOR_RESTART,
9090
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_1_ACK,
9191
MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK,
92-
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK,
93-
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA,
92+
MV64XXX_I2C_STATE_WAITING_FOR_TARGET_ACK,
93+
MV64XXX_I2C_STATE_WAITING_FOR_TARGET_DATA,
9494
};
9595

9696
/* Driver actions */
@@ -279,7 +279,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
279279
} else {
280280
drv_data->action = MV64XXX_I2C_ACTION_SEND_DATA;
281281
drv_data->state =
282-
MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK;
282+
MV64XXX_I2C_STATE_WAITING_FOR_TARGET_ACK;
283283
drv_data->bytes_left--;
284284
}
285285
break;
@@ -307,7 +307,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
307307
drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA;
308308
drv_data->bytes_left--;
309309
}
310-
drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA;
310+
drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_TARGET_DATA;
311311

312312
if ((drv_data->bytes_left == 1) || drv_data->aborting)
313313
drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_ACK;
@@ -797,8 +797,8 @@ static int mv64xxx_i2c_xfer_atomic(struct i2c_adapter *adap,
797797
}
798798

799799
static const struct i2c_algorithm mv64xxx_i2c_algo = {
800-
.master_xfer = mv64xxx_i2c_xfer,
801-
.master_xfer_atomic = mv64xxx_i2c_xfer_atomic,
800+
.xfer = mv64xxx_i2c_xfer,
801+
.xfer_atomic = mv64xxx_i2c_xfer_atomic,
802802
.functionality = mv64xxx_i2c_functionality,
803803
};
804804

0 commit comments

Comments
 (0)