@@ -137,7 +137,7 @@ struct svc_i3c_cmd {
137
137
u8 * in ;
138
138
const void * out ;
139
139
unsigned int len ;
140
- unsigned int read_len ;
140
+ unsigned int actual_len ;
141
141
bool continued ;
142
142
};
143
143
@@ -1039,7 +1039,7 @@ static int svc_i3c_master_write(struct svc_i3c_master *master,
1039
1039
static int svc_i3c_master_xfer (struct svc_i3c_master * master ,
1040
1040
bool rnw , unsigned int xfer_type , u8 addr ,
1041
1041
u8 * in , const u8 * out , unsigned int xfer_len ,
1042
- unsigned int * read_len , bool continued )
1042
+ unsigned int * actual_len , bool continued )
1043
1043
{
1044
1044
u32 reg ;
1045
1045
int ret ;
@@ -1052,7 +1052,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,
1052
1052
SVC_I3C_MCTRL_IBIRESP_NACK |
1053
1053
SVC_I3C_MCTRL_DIR (rnw ) |
1054
1054
SVC_I3C_MCTRL_ADDR (addr ) |
1055
- SVC_I3C_MCTRL_RDTERM (* read_len ),
1055
+ SVC_I3C_MCTRL_RDTERM (* actual_len ),
1056
1056
master -> regs + SVC_I3C_MCTRL );
1057
1057
1058
1058
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,
1090
1090
goto emit_stop ;
1091
1091
1092
1092
if (rnw )
1093
- * read_len = ret ;
1093
+ * actual_len = ret ;
1094
1094
1095
1095
ret = readl_poll_timeout (master -> regs + SVC_I3C_MSTATUS , reg ,
1096
1096
SVC_I3C_MSTATUS_COMPLETE (reg ), 0 , 1000 );
@@ -1172,7 +1172,7 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master)
1172
1172
1173
1173
ret = svc_i3c_master_xfer (master , cmd -> rnw , xfer -> type ,
1174
1174
cmd -> addr , cmd -> in , cmd -> out ,
1175
- cmd -> len , & cmd -> read_len ,
1175
+ cmd -> len , & cmd -> actual_len ,
1176
1176
cmd -> continued );
1177
1177
if (ret )
1178
1178
break ;
@@ -1258,7 +1258,7 @@ static int svc_i3c_master_send_bdcast_ccc_cmd(struct svc_i3c_master *master,
1258
1258
cmd -> in = NULL ;
1259
1259
cmd -> out = buf ;
1260
1260
cmd -> len = xfer_len ;
1261
- cmd -> read_len = 0 ;
1261
+ cmd -> actual_len = 0 ;
1262
1262
cmd -> continued = false;
1263
1263
1264
1264
mutex_lock (& master -> lock );
@@ -1278,7 +1278,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
1278
1278
struct i3c_ccc_cmd * ccc )
1279
1279
{
1280
1280
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 ;
1282
1282
struct svc_i3c_xfer * xfer ;
1283
1283
struct svc_i3c_cmd * cmd ;
1284
1284
int ret ;
@@ -1296,7 +1296,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
1296
1296
cmd -> in = NULL ;
1297
1297
cmd -> out = & ccc -> id ;
1298
1298
cmd -> len = 1 ;
1299
- cmd -> read_len = 0 ;
1299
+ cmd -> actual_len = 0 ;
1300
1300
cmd -> continued = true;
1301
1301
1302
1302
/* Directed message */
@@ -1306,7 +1306,7 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
1306
1306
cmd -> in = ccc -> rnw ? ccc -> dests [0 ].payload .data : NULL ;
1307
1307
cmd -> out = ccc -> rnw ? NULL : ccc -> dests [0 ].payload .data ,
1308
1308
cmd -> len = xfer_len ;
1309
- cmd -> read_len = read_len ;
1309
+ cmd -> actual_len = actual_len ;
1310
1310
cmd -> continued = false;
1311
1311
1312
1312
mutex_lock (& master -> lock );
@@ -1315,8 +1315,8 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,
1315
1315
svc_i3c_master_dequeue_xfer (master , xfer );
1316
1316
mutex_unlock (& master -> lock );
1317
1317
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 ;
1320
1320
1321
1321
ret = xfer -> ret ;
1322
1322
svc_i3c_master_free_xfer (xfer );
@@ -1366,7 +1366,7 @@ static int svc_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
1366
1366
cmd -> in = xfers [i ].rnw ? xfers [i ].data .in : NULL ;
1367
1367
cmd -> out = xfers [i ].rnw ? NULL : xfers [i ].data .out ;
1368
1368
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 ;
1370
1370
cmd -> continued = (i + 1 ) < nxfers ;
1371
1371
}
1372
1372
@@ -1406,7 +1406,7 @@ static int svc_i3c_master_i2c_xfers(struct i2c_dev_desc *dev,
1406
1406
cmd -> in = cmd -> rnw ? xfers [i ].buf : NULL ;
1407
1407
cmd -> out = cmd -> rnw ? NULL : xfers [i ].buf ;
1408
1408
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 ;
1410
1410
cmd -> continued = (i + 1 < nxfers );
1411
1411
}
1412
1412
0 commit comments