Skip to content

Commit eaa0870

Browse files
nxpfranklialexandrebelloni
authored andcommitted
i3c: master: switch to use new callback .i3c_xfers() from .priv_xfers()
Switch to use the new .i3c_xfers() callback, which supports all I3C transfer modes (SDR and HDR). Also replace struct i3c_priv_xfer with the new struct i3c_xfer, as i3c_priv_xfer is now an alias of i3c_xfer. No functional changes. Signed-off-by: Frank Li <Frank.Li@nxp.com> Tested-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com> Link: https://patch.msgid.link/20251203-i3c_xfer_cleanup_master-v2-1-7dd94d04ee2d@nxp.com Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 79c3ae7 commit eaa0870

5 files changed

Lines changed: 19 additions & 19 deletions

File tree

drivers/i3c/master/adi-i3c-master.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,9 @@ static int adi_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
365365
return 0;
366366
}
367367

368-
static int adi_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
369-
struct i3c_priv_xfer *xfers,
370-
int nxfers)
368+
static int adi_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
369+
struct i3c_xfer *xfers,
370+
int nxfers, enum i3c_xfer_mode mode)
371371
{
372372
struct i3c_master_controller *m = i3c_dev_get_master(dev);
373373
struct adi_i3c_master *master = to_adi_i3c_master(m);
@@ -919,7 +919,7 @@ static const struct i3c_master_controller_ops adi_i3c_master_ops = {
919919
.do_daa = adi_i3c_master_do_daa,
920920
.supports_ccc_cmd = adi_i3c_master_supports_ccc_cmd,
921921
.send_ccc_cmd = adi_i3c_master_send_ccc_cmd,
922-
.priv_xfers = adi_i3c_master_priv_xfers,
922+
.i3c_xfers = adi_i3c_master_i3c_xfers,
923923
.i2c_xfers = adi_i3c_master_i2c_xfers,
924924
.request_ibi = adi_i3c_master_request_ibi,
925925
.enable_ibi = adi_i3c_master_enable_ibi,

drivers/i3c/master/dw-i3c-master.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -902,9 +902,9 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
902902
return ret;
903903
}
904904

905-
static int dw_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
906-
struct i3c_priv_xfer *i3c_xfers,
907-
int i3c_nxfers)
905+
static int dw_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
906+
struct i3c_xfer *i3c_xfers,
907+
int i3c_nxfers, enum i3c_xfer_mode mode)
908908
{
909909
struct dw_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev);
910910
struct i3c_master_controller *m = i3c_dev_get_master(dev);
@@ -1498,7 +1498,7 @@ static const struct i3c_master_controller_ops dw_mipi_i3c_ops = {
14981498
.do_daa = dw_i3c_master_daa,
14991499
.supports_ccc_cmd = dw_i3c_master_supports_ccc_cmd,
15001500
.send_ccc_cmd = dw_i3c_master_send_ccc_cmd,
1501-
.priv_xfers = dw_i3c_master_priv_xfers,
1501+
.i3c_xfers = dw_i3c_master_i3c_xfers,
15021502
.attach_i2c_dev = dw_i3c_master_attach_i2c_dev,
15031503
.detach_i2c_dev = dw_i3c_master_detach_i2c_dev,
15041504
.i2c_xfers = dw_i3c_master_i2c_xfers,

drivers/i3c/master/i3c-master-cdns.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -720,9 +720,9 @@ static int cdns_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
720720
return ret;
721721
}
722722

723-
static int cdns_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
724-
struct i3c_priv_xfer *xfers,
725-
int nxfers)
723+
static int cdns_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
724+
struct i3c_xfer *xfers,
725+
int nxfers, enum i3c_xfer_mode mode)
726726
{
727727
struct i3c_master_controller *m = i3c_dev_get_master(dev);
728728
struct cdns_i3c_master *master = to_cdns_i3c_master(m);
@@ -1519,7 +1519,7 @@ static const struct i3c_master_controller_ops cdns_i3c_master_ops = {
15191519
.detach_i2c_dev = cdns_i3c_master_detach_i2c_dev,
15201520
.supports_ccc_cmd = cdns_i3c_master_supports_ccc_cmd,
15211521
.send_ccc_cmd = cdns_i3c_master_send_ccc_cmd,
1522-
.priv_xfers = cdns_i3c_master_priv_xfers,
1522+
.i3c_xfers = cdns_i3c_master_i3c_xfers,
15231523
.i2c_xfers = cdns_i3c_master_i2c_xfers,
15241524
.enable_ibi = cdns_i3c_master_enable_ibi,
15251525
.disable_ibi = cdns_i3c_master_disable_ibi,

drivers/i3c/master/mipi-i3c-hci/core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ static int i3c_hci_daa(struct i3c_master_controller *m)
266266
return hci->cmd->perform_daa(hci);
267267
}
268268

269-
static int i3c_hci_priv_xfers(struct i3c_dev_desc *dev,
270-
struct i3c_priv_xfer *i3c_xfers,
271-
int nxfers)
269+
static int i3c_hci_i3c_xfers(struct i3c_dev_desc *dev,
270+
struct i3c_xfer *i3c_xfers, int nxfers,
271+
enum i3c_xfer_mode mode)
272272
{
273273
struct i3c_master_controller *m = i3c_dev_get_master(dev);
274274
struct i3c_hci *hci = to_i3c_hci(m);
@@ -515,7 +515,7 @@ static const struct i3c_master_controller_ops i3c_hci_ops = {
515515
.bus_cleanup = i3c_hci_bus_cleanup,
516516
.do_daa = i3c_hci_daa,
517517
.send_ccc_cmd = i3c_hci_send_ccc_cmd,
518-
.priv_xfers = i3c_hci_priv_xfers,
518+
.i3c_xfers = i3c_hci_i3c_xfers,
519519
.i2c_xfers = i3c_hci_i2c_xfers,
520520
.attach_i3c_dev = i3c_hci_attach_i3c_dev,
521521
.reattach_i3c_dev = i3c_hci_reattach_i3c_dev,

drivers/i3c/master/renesas-i3c.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -794,8 +794,8 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
794794
return ret;
795795
}
796796

797-
static int renesas_i3c_priv_xfers(struct i3c_dev_desc *dev, struct i3c_priv_xfer *i3c_xfers,
798-
int i3c_nxfers)
797+
static int renesas_i3c_i3c_xfers(struct i3c_dev_desc *dev, struct i3c_xfer *i3c_xfers,
798+
int i3c_nxfers, enum i3c_xfer_mode mode)
799799
{
800800
struct i3c_master_controller *m = i3c_dev_get_master(dev);
801801
struct renesas_i3c *i3c = to_renesas_i3c(m);
@@ -1282,7 +1282,7 @@ static const struct i3c_master_controller_ops renesas_i3c_ops = {
12821282
.do_daa = renesas_i3c_daa,
12831283
.supports_ccc_cmd = renesas_i3c_supports_ccc_cmd,
12841284
.send_ccc_cmd = renesas_i3c_send_ccc_cmd,
1285-
.priv_xfers = renesas_i3c_priv_xfers,
1285+
.i3c_xfers = renesas_i3c_i3c_xfers,
12861286
.attach_i2c_dev = renesas_i3c_attach_i2c_dev,
12871287
.detach_i2c_dev = renesas_i3c_detach_i2c_dev,
12881288
.i2c_xfers = renesas_i3c_i2c_xfers,

0 commit comments

Comments
 (0)