@@ -314,7 +314,7 @@ static u32 em_i2c_func(struct i2c_adapter *adap)
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_SLAVE;
}
-static int em_i2c_reg_slave(struct i2c_client *slave)
+static int em_i2c_reg_target(struct i2c_client *slave)
{
struct em_i2c_device *priv = i2c_get_adapdata(slave->adapter);
@@ -332,7 +332,7 @@ static int em_i2c_reg_slave(struct i2c_client *slave)
return 0;
}
-static int em_i2c_unreg_slave(struct i2c_client *slave)
+static int em_i2c_unreg_target(struct i2c_client *slave)
{
struct em_i2c_device *priv = i2c_get_adapdata(slave->adapter);
@@ -352,10 +352,10 @@ static int em_i2c_unreg_slave(struct i2c_client *slave)
}
static const struct i2c_algorithm em_i2c_algo = {
- .master_xfer = em_i2c_xfer,
+ .xfer = em_i2c_xfer,
.functionality = em_i2c_func,
- .reg_slave = em_i2c_reg_slave,
- .unreg_slave = em_i2c_unreg_slave,
+ .reg_target = em_i2c_reg_target,
+ .unreg_target = em_i2c_unreg_target,
};
static int em_i2c_probe(struct platform_device *pdev)
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-emev2.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)