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>

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index dc160cbc315531e06868415a20b2541c8e1091be..29f94efedf605a499b3be173a6da7f039aea4a55 100644 (file)
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -89,8 +89,8 @@ enum {
        MV64XXX_I2C_STATE_WAITING_FOR_RESTART,
        MV64XXX_I2C_STATE_WAITING_FOR_ADDR_1_ACK,
        MV64XXX_I2C_STATE_WAITING_FOR_ADDR_2_ACK,
-       MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK,
-       MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA,
+       MV64XXX_I2C_STATE_WAITING_FOR_TARGET_ACK,
+       MV64XXX_I2C_STATE_WAITING_FOR_TARGET_DATA,
 };
 
 /* Driver actions */
@@ -279,7 +279,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
                } else {
                        drv_data->action = MV64XXX_I2C_ACTION_SEND_DATA;
                        drv_data->state =
-                               MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_ACK;
+                               MV64XXX_I2C_STATE_WAITING_FOR_TARGET_ACK;
                        drv_data->bytes_left--;
                }
                break;
@@ -307,7 +307,7 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status)
                        drv_data->action = MV64XXX_I2C_ACTION_RCV_DATA;
                        drv_data->bytes_left--;
                }
-               drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_SLAVE_DATA;
+               drv_data->state = MV64XXX_I2C_STATE_WAITING_FOR_TARGET_DATA;
 
                if ((drv_data->bytes_left == 1) || drv_data->aborting)
                        drv_data->cntl_bits &= ~MV64XXX_I2C_REG_CONTROL_ACK;
@@ -797,8 +797,8 @@ static int mv64xxx_i2c_xfer_atomic(struct i2c_adapter *adap,
 }
 
 static const struct i2c_algorithm mv64xxx_i2c_algo = {
-       .master_xfer = mv64xxx_i2c_xfer,
-       .master_xfer_atomic = mv64xxx_i2c_xfer_atomic,
+       .xfer = mv64xxx_i2c_xfer,
+       .xfer_atomic = mv64xxx_i2c_xfer_atomic,
        .functionality = mv64xxx_i2c_functionality,
 };