Skip to content

Commit 39a6695

Browse files
Wolfram SangAndi Shyti
authored andcommitted
i2c: rzv2m: 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 <[email protected]> Reviewed-by: Andi Shyti <[email protected]> Signed-off-by: Andi Shyti <[email protected]>
1 parent fd4b7e0 commit 39a6695

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/i2c/busses/i2c-rzv2m.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ static int rzv2m_i2c_stop_condition(struct rzv2m_i2c_priv *priv)
321321
100, jiffies_to_usecs(priv->adap.timeout));
322322
}
323323

324-
static int rzv2m_i2c_master_xfer_msg(struct rzv2m_i2c_priv *priv,
325-
struct i2c_msg *msg, int stop)
324+
static int rzv2m_i2c_xfer_msg(struct rzv2m_i2c_priv *priv,
325+
struct i2c_msg *msg, int stop)
326326
{
327327
unsigned int count = 0;
328328
int ret, read = !!(msg->flags & I2C_M_RD);
@@ -351,8 +351,8 @@ static int rzv2m_i2c_master_xfer_msg(struct rzv2m_i2c_priv *priv,
351351
return ret;
352352
}
353353

354-
static int rzv2m_i2c_master_xfer(struct i2c_adapter *adap,
355-
struct i2c_msg *msgs, int num)
354+
static int rzv2m_i2c_xfer(struct i2c_adapter *adap,
355+
struct i2c_msg *msgs, int num)
356356
{
357357
struct rzv2m_i2c_priv *priv = i2c_get_adapdata(adap);
358358
struct device *dev = priv->adap.dev.parent;
@@ -370,7 +370,7 @@ static int rzv2m_i2c_master_xfer(struct i2c_adapter *adap,
370370

371371
/* I2C main transfer */
372372
for (i = 0; i < num; i++) {
373-
ret = rzv2m_i2c_master_xfer_msg(priv, &msgs[i], i == (num - 1));
373+
ret = rzv2m_i2c_xfer_msg(priv, &msgs[i], i == (num - 1));
374374
if (ret < 0)
375375
goto out;
376376
}
@@ -408,7 +408,7 @@ static const struct i2c_adapter_quirks rzv2m_i2c_quirks = {
408408
};
409409

410410
static struct i2c_algorithm rzv2m_i2c_algo = {
411-
.master_xfer = rzv2m_i2c_master_xfer,
411+
.xfer = rzv2m_i2c_xfer,
412412
.functionality = rzv2m_i2c_func,
413413
};
414414

0 commit comments

Comments
 (0)