Skip to content

Commit 6fb6173

Browse files
nxpfranklialexandrebelloni
authored andcommitted
i3c: master: svc: rename read_len as actual_len
I3C transfer (SDR), target can early terminate read transfer. I3C transfer (HDR), target can end write transfer. I2C transfer, target can NACK write transfer. 'actual_len' is better name than 'read_len'. Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Frank Li <Frank.Li@nxp.com> Link: https://lore.kernel.org/r/20231201222532.2431484-5-Frank.Li@nxp.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent e5e3df0 commit 6fb6173

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

drivers/i3c/master/svc-i3c-master.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ struct svc_i3c_cmd {
137137
u8 *in;
138138
const void *out;
139139
unsigned int len;
140-
unsigned int read_len;
140+
unsigned int actual_len;
141141
bool continued;
142142
};
143143

@@ -1039,7 +1039,7 @@ static int svc_i3c_master_write(struct svc_i3c_master *master,
10391039
static int svc_i3c_master_xfer(struct svc_i3c_master *master,
10401040
bool rnw, unsigned int xfer_type, u8 addr,
10411041
u8 *in, const u8 *out, unsigned int xfer_len,
1042-
unsigned int *read_len, bool continued)
1042+
unsigned int *actual_len, bool continued)
10431043
{
10441044
u32 reg;
10451045
int ret;
@@ -1052,7 +1052,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
10521052
SVC_I3C_MCTRL_IBIRESP_NACK |
10531053
SVC_I3C_MCTRL_DIR(rnw) |
10541054
SVC_I3C_MCTRL_ADDR(addr) |
1055-
SVC_I3C_MCTRL_RDTERM(*read_len),
1055+
SVC_I3C_MCTRL_RDTERM(*actual_len),
10561056
master->regs + SVC_I3C_MCTRL);
10571057

10581058
ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
@@ -1090,7 +1090,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
10901090
goto emit_stop;
10911091

10921092
if (rnw)
1093-
*read_len = ret;
1093+
*actual_len = ret;
10941094

10951095
ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
10961096
SVC_I3C_MSTATUS_COMPLETE(reg), 0, 1000);
@@ -1172,7 +1172,7 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master)
11721172

11731173
ret = svc_i3c_master_xfer(master, cmd->rnw, xfer->type,
11741174
cmd->addr, cmd->in, cmd->out,
1175-
cmd->len, &cmd->read_len,
1175+
cmd->len, &cmd->actual_len,
11761176
cmd->continued);
11771177
if (ret)
11781178
break;
@@ -1258,7 +1258,7 @@ static int svc_i3c_master_send_bdcast_ccc_cmd(struct svc_i3c_master *master,
12581258
cmd->in = NULL;
12591259
cmd->out = buf;
12601260
cmd->len = xfer_len;
1261-
cmd->read_len = 0;
1261+
cmd->actual_len = 0;
12621262
cmd->continued = false;
12631263

12641264
mutex_lock(&master->lock);
@@ -1278,7 +1278,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
12781278
struct i3c_ccc_cmd *ccc)
12791279
{
12801280
unsigned int xfer_len = ccc->dests[0].payload.len;
1281-
unsigned int read_len = ccc->rnw ? xfer_len : 0;
1281+
unsigned int actual_len = ccc->rnw ? xfer_len : 0;
12821282
struct svc_i3c_xfer *xfer;
12831283
struct svc_i3c_cmd *cmd;
12841284
int ret;
@@ -1296,7 +1296,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
12961296
cmd->in = NULL;
12971297
cmd->out = &ccc->id;
12981298
cmd->len = 1;
1299-
cmd->read_len = 0;
1299+
cmd->actual_len = 0;
13001300
cmd->continued = true;
13011301

13021302
/* Directed message */
@@ -1306,7 +1306,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
13061306
cmd->in = ccc->rnw ? ccc->dests[0].payload.data : NULL;
13071307
cmd->out = ccc->rnw ? NULL : ccc->dests[0].payload.data,
13081308
cmd->len = xfer_len;
1309-
cmd->read_len = read_len;
1309+
cmd->actual_len = actual_len;
13101310
cmd->continued = false;
13111311

13121312
mutex_lock(&master->lock);
@@ -1315,8 +1315,8 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
13151315
svc_i3c_master_dequeue_xfer(master, xfer);
13161316
mutex_unlock(&master->lock);
13171317

1318-
if (cmd->read_len != xfer_len)
1319-
ccc->dests[0].payload.len = cmd->read_len;
1318+
if (cmd->actual_len != xfer_len)
1319+
ccc->dests[0].payload.len = cmd->actual_len;
13201320

13211321
ret = xfer->ret;
13221322
svc_i3c_master_free_xfer(xfer);
@@ -1366,7 +1366,7 @@ static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
13661366
cmd->in = xfers[i].rnw ? xfers[i].data.in : NULL;
13671367
cmd->out = xfers[i].rnw ? NULL : xfers[i].data.out;
13681368
cmd->len = xfers[i].len;
1369-
cmd->read_len = xfers[i].rnw ? xfers[i].len : 0;
1369+
cmd->actual_len = xfers[i].rnw ? xfers[i].len : 0;
13701370
cmd->continued = (i + 1) < nxfers;
13711371
}
13721372

@@ -1406,7 +1406,7 @@ static int svc_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,
14061406
cmd->in = cmd->rnw ? xfers[i].buf : NULL;
14071407
cmd->out = cmd->rnw ? NULL : xfers[i].buf;
14081408
cmd->len = xfers[i].len;
1409-
cmd->read_len = cmd->rnw ? xfers[i].len : 0;
1409+
cmd->actual_len = cmd->rnw ? xfers[i].len : 0;
14101410
cmd->continued = (i + 1 < nxfers);
14111411
}
14121412

0 commit comments

Comments
 (0)