Commit a02d46be authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio: adc: ad4062: Switch from struct i3c_priv_xfer to struct i3c_xfer 



Commit 9904232a ("i3c: drop i3c_priv_xfer and i3c_device_do_priv_xfers()")
currently in the i3c/for-next tree removes the deprecated
struct i3c_priv_xfer and i3c_device_do_priv_xfers().

Switch to struct i3c_xfer and i3c_device_do_xfers(..., I3C_SDR)
now rather causing a build issue when both trees are merged.

Suggested-by: default avatarSasha Levin <sashal@kernel.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a35df4c1

drivers/iio/adc/ad4062.c

+13 −13
Original line number Diff line number Diff line
@@ -468,13 +468,13 @@ static int ad4062_set_operation_mode(struct ad4062_state *st, 


	if (mode == AD4062_MONITOR_MODE) {

		/* Change address pointer to enter monitor mode */

		struct i3c_priv_xfer xfer_trigger = {

		struct i3c_xfer xfer_trigger = {

			.data.out = &st->conv_addr,

			.len = sizeof(st->conv_addr),

			.rnw = false,

		};

		st->conv_addr = AD4062_REG_CONV_TRIGGER_32BITS;

		return i3c_device_do_priv_xfers(st->i3cdev, &xfer_trigger, 1);

		return i3c_device_do_xfers(st->i3cdev, &xfer_trigger, 1, I3C_SDR);

	}



	return regmap_write(st->regmap, AD4062_REG_MODE_SET,
@@ -607,18 +607,18 @@ static void ad4062_trigger_work(struct work_struct *work) 
	 * Read current conversion, if at reg CONV_READ, stop bit triggers

	 * next sample and does not need writing the address.

	 */

	struct i3c_priv_xfer xfer_sample = {

	struct i3c_xfer xfer_sample = {

		.data.in = &st->buf.be32,

		.len = st->conv_sizeof,

		.rnw = true,

	};

	struct i3c_priv_xfer xfer_trigger = {

	struct i3c_xfer xfer_trigger = {

		.data.out = &st->conv_addr,

		.len = sizeof(st->conv_addr),

		.rnw = false,

	};



	ret = i3c_device_do_priv_xfers(st->i3cdev, &xfer_sample, 1);

	ret = i3c_device_do_xfers(st->i3cdev, &xfer_sample, 1, I3C_SDR);

	if (ret)

		return;
@@ -627,7 +627,7 @@ static void ad4062_trigger_work(struct work_struct *work) 
	if (st->gpo_irq[1])

		return;



	i3c_device_do_priv_xfers(st->i3cdev, &xfer_trigger, 1);

	i3c_device_do_xfers(st->i3cdev, &xfer_trigger, 1, I3C_SDR);

}



static irqreturn_t ad4062_poll_handler(int irq, void *p)
@@ -852,12 +852,12 @@ static int ad4062_set_chan_calibscale(struct ad4062_state *st, int gain_int, 
static int ad4062_read_chan_raw(struct ad4062_state *st, int *val)

{

	struct i3c_device *i3cdev = st->i3cdev;

	struct i3c_priv_xfer xfer_trigger = {

	struct i3c_xfer xfer_trigger = {

		.data.out = &st->conv_addr,

		.len = sizeof(st->conv_addr),

		.rnw = false,

	};

	struct i3c_priv_xfer xfer_sample = {

	struct i3c_xfer xfer_sample = {

		.data.in = &st->buf.be32,

		.len = sizeof(st->buf.be32),

		.rnw = true,
@@ -876,7 +876,7 @@ static int ad4062_read_chan_raw(struct ad4062_state *st, int *val) 
	reinit_completion(&st->completion);

	/* Change address pointer to trigger conversion */

	st->conv_addr = AD4062_REG_CONV_TRIGGER_32BITS;

	ret = i3c_device_do_priv_xfers(i3cdev, &xfer_trigger, 1);

	ret = i3c_device_do_xfers(i3cdev, &xfer_trigger, 1, I3C_SDR);

	if (ret)

		return ret;

	/*
@@ -888,7 +888,7 @@ static int ad4062_read_chan_raw(struct ad4062_state *st, int *val) 
	if (!ret)

		return -ETIMEDOUT;



	ret = i3c_device_do_priv_xfers(i3cdev, &xfer_sample, 1);

	ret = i3c_device_do_xfers(i3cdev, &xfer_sample, 1, I3C_SDR);

	if (ret)

		return ret;

	*val = be32_to_cpu(st->buf.be32);
@@ -1236,7 +1236,7 @@ static int pm_ad4062_triggered_buffer_postenable(struct ad4062_state *st) 
	st->conv_sizeof = ad4062_sizeof_storagebits(st);

	st->conv_addr = ad4062_get_conv_addr(st, st->conv_sizeof);

	/* CONV_READ requires read to trigger first sample. */

	struct i3c_priv_xfer xfer_sample[2] = {

	struct i3c_xfer xfer_sample[2] = {

		{

			.data.out = &st->conv_addr,

			.len = sizeof(st->conv_addr),
@@ -1249,8 +1249,8 @@ static int pm_ad4062_triggered_buffer_postenable(struct ad4062_state *st) 
		}

	};



	return i3c_device_do_priv_xfers(st->i3cdev, xfer_sample,

					st->gpo_irq[1] ? 2 : 1);

	return i3c_device_do_xfers(st->i3cdev, xfer_sample,

				   st->gpo_irq[1] ? 2 : 1, I3C_SDR);

}



static int ad4062_triggered_buffer_postenable(struct iio_dev *indio_dev)