Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
iio: adc: ad4062: Switch from struct i3c_priv_xfer to struct i3c_xfer
Commit 9904232ae30bc ("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: Sasha Levin <sashal@kernel.org>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+13
-13
+13
-13
drivers/iio/adc/ad4062.c
+13
-13
drivers/iio/adc/ad4062.c
···
468
468
469
469
if (mode == AD4062_MONITOR_MODE) {
470
470
/* Change address pointer to enter monitor mode */
471
-
struct i3c_priv_xfer xfer_trigger = {
471
+
struct i3c_xfer xfer_trigger = {
472
472
.data.out = &st->conv_addr,
473
473
.len = sizeof(st->conv_addr),
474
474
.rnw = false,
475
475
};
476
476
st->conv_addr = AD4062_REG_CONV_TRIGGER_32BITS;
477
-
return i3c_device_do_priv_xfers(st->i3cdev, &xfer_trigger, 1);
477
+
return i3c_device_do_xfers(st->i3cdev, &xfer_trigger, 1, I3C_SDR);
478
478
}
479
479
480
480
return regmap_write(st->regmap, AD4062_REG_MODE_SET,
···
607
607
* Read current conversion, if at reg CONV_READ, stop bit triggers
608
608
* next sample and does not need writing the address.
609
609
*/
610
-
struct i3c_priv_xfer xfer_sample = {
610
+
struct i3c_xfer xfer_sample = {
611
611
.data.in = &st->buf.be32,
612
612
.len = st->conv_sizeof,
613
613
.rnw = true,
614
614
};
615
-
struct i3c_priv_xfer xfer_trigger = {
615
+
struct i3c_xfer xfer_trigger = {
616
616
.data.out = &st->conv_addr,
617
617
.len = sizeof(st->conv_addr),
618
618
.rnw = false,
619
619
};
620
620
621
-
ret = i3c_device_do_priv_xfers(st->i3cdev, &xfer_sample, 1);
621
+
ret = i3c_device_do_xfers(st->i3cdev, &xfer_sample, 1, I3C_SDR);
622
622
if (ret)
623
623
return;
624
624
···
627
627
if (st->gpo_irq[1])
628
628
return;
629
629
630
-
i3c_device_do_priv_xfers(st->i3cdev, &xfer_trigger, 1);
630
+
i3c_device_do_xfers(st->i3cdev, &xfer_trigger, 1, I3C_SDR);
631
631
}
632
632
633
633
static irqreturn_t ad4062_poll_handler(int irq, void *p)
···
852
852
static int ad4062_read_chan_raw(struct ad4062_state *st, int *val)
853
853
{
854
854
struct i3c_device *i3cdev = st->i3cdev;
855
-
struct i3c_priv_xfer xfer_trigger = {
855
+
struct i3c_xfer xfer_trigger = {
856
856
.data.out = &st->conv_addr,
857
857
.len = sizeof(st->conv_addr),
858
858
.rnw = false,
859
859
};
860
-
struct i3c_priv_xfer xfer_sample = {
860
+
struct i3c_xfer xfer_sample = {
861
861
.data.in = &st->buf.be32,
862
862
.len = sizeof(st->buf.be32),
863
863
.rnw = true,
···
876
876
reinit_completion(&st->completion);
877
877
/* Change address pointer to trigger conversion */
878
878
st->conv_addr = AD4062_REG_CONV_TRIGGER_32BITS;
879
-
ret = i3c_device_do_priv_xfers(i3cdev, &xfer_trigger, 1);
879
+
ret = i3c_device_do_xfers(i3cdev, &xfer_trigger, 1, I3C_SDR);
880
880
if (ret)
881
881
return ret;
882
882
/*
···
888
888
if (!ret)
889
889
return -ETIMEDOUT;
890
890
891
-
ret = i3c_device_do_priv_xfers(i3cdev, &xfer_sample, 1);
891
+
ret = i3c_device_do_xfers(i3cdev, &xfer_sample, 1, I3C_SDR);
892
892
if (ret)
893
893
return ret;
894
894
*val = be32_to_cpu(st->buf.be32);
···
1236
1236
st->conv_sizeof = ad4062_sizeof_storagebits(st);
1237
1237
st->conv_addr = ad4062_get_conv_addr(st, st->conv_sizeof);
1238
1238
/* CONV_READ requires read to trigger first sample. */
1239
-
struct i3c_priv_xfer xfer_sample[2] = {
1239
+
struct i3c_xfer xfer_sample[2] = {
1240
1240
{
1241
1241
.data.out = &st->conv_addr,
1242
1242
.len = sizeof(st->conv_addr),
···
1249
1249
}
1250
1250
};
1251
1251
1252
-
return i3c_device_do_priv_xfers(st->i3cdev, xfer_sample,
1253
-
st->gpo_irq[1] ? 2 : 1);
1252
+
return i3c_device_do_xfers(st->i3cdev, xfer_sample,
1253
+
st->gpo_irq[1] ? 2 : 1, I3C_SDR);
1254
1254
}
1255
1255
1256
1256
static int ad4062_triggered_buffer_postenable(struct iio_dev *indio_dev)