mirror of
https://github.com/torvalds/linux.git
synced 2026-05-27 16:44:58 +02:00
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>
This commit is contained in:
parent
79c3ae7ada
commit
eaa0870387
|
|
@ -365,9 +365,9 @@ static int adi_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int adi_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_priv_xfer *xfers,
|
||||
int nxfers)
|
||||
static int adi_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_xfer *xfers,
|
||||
int nxfers, enum i3c_xfer_mode mode)
|
||||
{
|
||||
struct i3c_master_controller *m = i3c_dev_get_master(dev);
|
||||
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 = {
|
|||
.do_daa = adi_i3c_master_do_daa,
|
||||
.supports_ccc_cmd = adi_i3c_master_supports_ccc_cmd,
|
||||
.send_ccc_cmd = adi_i3c_master_send_ccc_cmd,
|
||||
.priv_xfers = adi_i3c_master_priv_xfers,
|
||||
.i3c_xfers = adi_i3c_master_i3c_xfers,
|
||||
.i2c_xfers = adi_i3c_master_i2c_xfers,
|
||||
.request_ibi = adi_i3c_master_request_ibi,
|
||||
.enable_ibi = adi_i3c_master_enable_ibi,
|
||||
|
|
|
|||
|
|
@ -902,9 +902,9 @@ static int dw_i3c_master_daa(struct i3c_master_controller *m)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int dw_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_priv_xfer *i3c_xfers,
|
||||
int i3c_nxfers)
|
||||
static int dw_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_xfer *i3c_xfers,
|
||||
int i3c_nxfers, enum i3c_xfer_mode mode)
|
||||
{
|
||||
struct dw_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev);
|
||||
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 = {
|
|||
.do_daa = dw_i3c_master_daa,
|
||||
.supports_ccc_cmd = dw_i3c_master_supports_ccc_cmd,
|
||||
.send_ccc_cmd = dw_i3c_master_send_ccc_cmd,
|
||||
.priv_xfers = dw_i3c_master_priv_xfers,
|
||||
.i3c_xfers = dw_i3c_master_i3c_xfers,
|
||||
.attach_i2c_dev = dw_i3c_master_attach_i2c_dev,
|
||||
.detach_i2c_dev = dw_i3c_master_detach_i2c_dev,
|
||||
.i2c_xfers = dw_i3c_master_i2c_xfers,
|
||||
|
|
|
|||
|
|
@ -720,9 +720,9 @@ static int cdns_i3c_master_send_ccc_cmd(struct i3c_master_controller *m,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int cdns_i3c_master_priv_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_priv_xfer *xfers,
|
||||
int nxfers)
|
||||
static int cdns_i3c_master_i3c_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_xfer *xfers,
|
||||
int nxfers, enum i3c_xfer_mode mode)
|
||||
{
|
||||
struct i3c_master_controller *m = i3c_dev_get_master(dev);
|
||||
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 = {
|
|||
.detach_i2c_dev = cdns_i3c_master_detach_i2c_dev,
|
||||
.supports_ccc_cmd = cdns_i3c_master_supports_ccc_cmd,
|
||||
.send_ccc_cmd = cdns_i3c_master_send_ccc_cmd,
|
||||
.priv_xfers = cdns_i3c_master_priv_xfers,
|
||||
.i3c_xfers = cdns_i3c_master_i3c_xfers,
|
||||
.i2c_xfers = cdns_i3c_master_i2c_xfers,
|
||||
.enable_ibi = cdns_i3c_master_enable_ibi,
|
||||
.disable_ibi = cdns_i3c_master_disable_ibi,
|
||||
|
|
|
|||
|
|
@ -266,9 +266,9 @@ static int i3c_hci_daa(struct i3c_master_controller *m)
|
|||
return hci->cmd->perform_daa(hci);
|
||||
}
|
||||
|
||||
static int i3c_hci_priv_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_priv_xfer *i3c_xfers,
|
||||
int nxfers)
|
||||
static int i3c_hci_i3c_xfers(struct i3c_dev_desc *dev,
|
||||
struct i3c_xfer *i3c_xfers, int nxfers,
|
||||
enum i3c_xfer_mode mode)
|
||||
{
|
||||
struct i3c_master_controller *m = i3c_dev_get_master(dev);
|
||||
struct i3c_hci *hci = to_i3c_hci(m);
|
||||
|
|
@ -515,7 +515,7 @@ static const struct i3c_master_controller_ops i3c_hci_ops = {
|
|||
.bus_cleanup = i3c_hci_bus_cleanup,
|
||||
.do_daa = i3c_hci_daa,
|
||||
.send_ccc_cmd = i3c_hci_send_ccc_cmd,
|
||||
.priv_xfers = i3c_hci_priv_xfers,
|
||||
.i3c_xfers = i3c_hci_i3c_xfers,
|
||||
.i2c_xfers = i3c_hci_i2c_xfers,
|
||||
.attach_i3c_dev = i3c_hci_attach_i3c_dev,
|
||||
.reattach_i3c_dev = i3c_hci_reattach_i3c_dev,
|
||||
|
|
|
|||
|
|
@ -794,8 +794,8 @@ static int renesas_i3c_send_ccc_cmd(struct i3c_master_controller *m,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int renesas_i3c_priv_xfers(struct i3c_dev_desc *dev, struct i3c_priv_xfer *i3c_xfers,
|
||||
int i3c_nxfers)
|
||||
static int renesas_i3c_i3c_xfers(struct i3c_dev_desc *dev, struct i3c_xfer *i3c_xfers,
|
||||
int i3c_nxfers, enum i3c_xfer_mode mode)
|
||||
{
|
||||
struct i3c_master_controller *m = i3c_dev_get_master(dev);
|
||||
struct renesas_i3c *i3c = to_renesas_i3c(m);
|
||||
|
|
@ -1282,7 +1282,7 @@ static const struct i3c_master_controller_ops renesas_i3c_ops = {
|
|||
.do_daa = renesas_i3c_daa,
|
||||
.supports_ccc_cmd = renesas_i3c_supports_ccc_cmd,
|
||||
.send_ccc_cmd = renesas_i3c_send_ccc_cmd,
|
||||
.priv_xfers = renesas_i3c_priv_xfers,
|
||||
.i3c_xfers = renesas_i3c_i3c_xfers,
|
||||
.attach_i2c_dev = renesas_i3c_attach_i2c_dev,
|
||||
.detach_i2c_dev = renesas_i3c_detach_i2c_dev,
|
||||
.i2c_xfers = renesas_i3c_i2c_xfers,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user