Commit d8cc0b91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'i3c/for-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux 

Pull further i3c update from Alexandre Belloni:
 "We are removing a legacy API callback and having this sooner rather
  than later will help ensuring no one introduces a new driver using it.

  I've also added patches removing the "__free(...) = NULL" pattern
  because I'm sure we won't avoid people sending those following the
  mailing list discussion..."

* tag 'i3c/for-6.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: adi: Fix confusing cleanup.h syntax
  i3c: master: Fix confusing cleanup.h syntax
  i3c: master: cleanup callback .priv_xfers()
  i3c: master: switch to use new callback .i3c_xfers() from .priv_xfers()
parents d324e9a9 136209e6

drivers/i3c/master.c

+3 −14
Original line number Diff line number Diff line
@@ -1742,11 +1742,10 @@ EXPORT_SYMBOL_GPL(i3c_master_do_daa); 
struct i3c_dma *i3c_master_dma_map_single(struct device *dev, void *buf,

	size_t len, bool force_bounce, enum dma_data_direction dir)

{

	struct i3c_dma *dma_xfer __free(kfree) = NULL;

	void *bounce __free(kfree) = NULL;

	void *dma_buf = buf;



	dma_xfer = kzalloc(sizeof(*dma_xfer), GFP_KERNEL);

	struct i3c_dma *dma_xfer __free(kfree) = kzalloc(sizeof(*dma_xfer), GFP_KERNEL);

	if (!dma_xfer)

		return NULL;
@@ -2819,14 +2818,10 @@ EXPORT_SYMBOL_GPL(i3c_generic_ibi_recycle_slot); 


static int i3c_master_check_ops(const struct i3c_master_controller_ops *ops)

{

	if (!ops || !ops->bus_init ||

	if (!ops || !ops->bus_init || !ops->i3c_xfers ||

	    !ops->send_ccc_cmd || !ops->do_daa || !ops->i2c_xfers)

		return -EINVAL;



	/* Must provide one of priv_xfers (SDR only) or i3c_xfers (all modes) */

	if (!ops->priv_xfers && !ops->i3c_xfers)

		return -EINVAL;



	if (ops->request_ibi &&

	    (!ops->enable_ibi || !ops->disable_ibi || !ops->free_ibi ||

	     !ops->recycle_ibi_slot))
@@ -3031,13 +3026,7 @@ int i3c_dev_do_xfers_locked(struct i3c_dev_desc *dev, struct i3c_xfer *xfers, 
	if (mode != I3C_SDR && !(master->this->info.hdr_cap & BIT(mode)))

		return -EOPNOTSUPP;



	if (master->ops->i3c_xfers)

	return master->ops->i3c_xfers(dev, xfers, nxfers, mode);



	if (mode != I3C_SDR)

		return -EINVAL;



	return master->ops->priv_xfers(dev, xfers, nxfers);

}



int i3c_dev_disable_ibi_locked(struct i3c_dev_desc *dev)

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

+8 −10
Original line number Diff line number Diff line
@@ -332,10 +332,9 @@ static int adi_i3c_master_send_ccc_cmd(struct i3c_master_controller *m, 
				       struct i3c_ccc_cmd *cmd)

{

	struct adi_i3c_master *master = to_adi_i3c_master(m);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	struct adi_i3c_cmd *ccmd;



	xfer = adi_i3c_master_alloc_xfer(master, 1);

	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, 1);

	if (!xfer)

		return -ENOMEM;
@@ -365,19 +364,18 @@ 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);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	int i, ret;



	if (!nxfers)

		return 0;



	xfer = adi_i3c_master_alloc_xfer(master, nxfers);

	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, nxfers);

	if (!xfer)

		return -ENOMEM;
@@ -777,7 +775,6 @@ static int adi_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, 
{

	struct i3c_master_controller *m = i2c_dev_get_master(dev);

	struct adi_i3c_master *master = to_adi_i3c_master(m);

	struct adi_i3c_xfer *xfer __free(kfree) = NULL;

	int i;



	if (!nxfers)
@@ -786,7 +783,8 @@ static int adi_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, 
		if (xfers[i].flags & I2C_M_TEN)

			return -EOPNOTSUPP;

	}

	xfer = adi_i3c_master_alloc_xfer(master, nxfers);



	struct adi_i3c_xfer *xfer __free(kfree) = adi_i3c_master_alloc_xfer(master, nxfers);

	if (!xfer)

		return -ENOMEM;
@@ -919,7 +917,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,

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

+4 −4
Original line number Diff line number Diff line
@@ -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,

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

+4 −4
Original line number Diff line number Diff line
@@ -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,

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

+4 −4
Original line number Diff line number Diff line
@@ -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,