The register read/write with IIO backend will require to claim the
direct mode, and doing so requires passing the corresponding iio_dev
structure.
So we need to modify the function signature to pass the iio_dev
structure.
Signed-off-by: Guillaume Stols <gstols@xxxxxxxxxxxx>
---
drivers/iio/adc/ad7606.c | 25 +++++++++++--------------
drivers/iio/adc/ad7606.h | 8 ++++----
drivers/iio/adc/ad7606_spi.c | 10 +++++-----
3 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c
index 2f13b9cd2ed2..bf1f84367c72 100644
--- a/drivers/iio/adc/ad7606.c
+++ b/drivers/iio/adc/ad7606.c
@@ -574,13 +574,13 @@ static int ad7606_reg_access(struct iio_dev *indio_dev,
guard(mutex)(&st->lock);
if (readval) {
- ret = st->bops->reg_read(st, reg);
+ ret = st->bops->reg_read(indio_dev, reg);
if (ret < 0)
return ret;
*readval = ret;
return 0;
} else {
- return st->bops->reg_write(st, reg, writeval);
+ return st->bops->reg_write(indio_dev, reg, writeval);
}
}
@@ -1148,26 +1148,26 @@ static const struct iio_trigger_ops ad7606_trigger_ops = {
.validate_device = iio_trigger_validate_own_device,
};
-static int ad7606_write_mask(struct ad7606_state *st,
+static int ad7606_write_mask(struct iio_dev *indio_dev,
unsigned int addr,
unsigned long mask,
unsigned int val)
{
+ struct ad7606_state *st = iio_priv(indio_dev);
int readval;
- readval = st->bops->reg_read(st, addr);
+ readval = st->bops->reg_read(indio_dev, addr);
if (readval < 0)
return readval;
readval &= ~mask;
readval |= val;
- return st->bops->reg_write(st, addr, readval);
+ return st->bops->reg_write(indio_dev, addr, readval);
}
static int ad7616_write_scale_sw(struct iio_dev *indio_dev, int ch, int val)
{
- struct ad7606_state *st = iio_priv(indio_dev);
unsigned int ch_addr, mode, ch_index;
/*
@@ -1189,23 +1189,20 @@ static int ad7616_write_scale_sw(struct iio_dev *indio_dev, int ch, int val)
/* 0b01 for 2.5v, 0b10 for 5v and 0b11 for 10v */
mode = AD7616_RANGE_CH_MODE(ch_index, ((val + 1) & 0b11));
- return ad7606_write_mask(st, ch_addr, AD7616_RANGE_CH_MSK(ch_index),
+ return ad7606_write_mask(indio_dev, ch_addr, AD7616_RANGE_CH_MSK(ch_index),
mode);
}
static int ad7616_write_os_sw(struct iio_dev *indio_dev, int val)
{
- struct ad7606_state *st = iio_priv(indio_dev);
- return ad7606_write_mask(st, AD7616_CONFIGURATION_REGISTER,
+ return ad7606_write_mask(indio_dev, AD7616_CONFIGURATION_REGISTER,
AD7616_OS_MASK, val << 2);
}
static int ad7606_write_scale_sw(struct iio_dev *indio_dev, int ch, int val)
{
- struct ad7606_state *st = iio_priv(indio_dev);
-
- return ad7606_write_mask(st,
+ return ad7606_write_mask(indio_dev,
AD7606_RANGE_CH_ADDR(ch),
AD7606_RANGE_CH_MSK(ch),
AD7606_RANGE_CH_MODE(ch, val));
@@ -1215,7 +1212,7 @@ static int ad7606_write_os_sw(struct iio_dev *indio_dev, int val)
{
struct ad7606_state *st = iio_priv(indio_dev);
- return st->bops->reg_write(st, AD7606_OS_MODE, val);
+ return st->bops->reg_write(indio_dev, AD7606_OS_MODE, val);
}
static int ad7616_sw_mode_setup(struct iio_dev *indio_dev)
@@ -1236,7 +1233,7 @@ static int ad7616_sw_mode_setup(struct iio_dev *indio_dev)
return ret;
/* Activate Burst mode and SEQEN MODE */
- return ad7606_write_mask(st,
+ return ad7606_write_mask(indio_dev,
AD7616_CONFIGURATION_REGISTER,
AD7616_BURST_MODE | AD7616_SEQEN_MODE,
AD7616_BURST_MODE | AD7616_SEQEN_MODE);
diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h
index 7a044b499cfe..eca7ea99e24d 100644
--- a/drivers/iio/adc/ad7606.h
+++ b/drivers/iio/adc/ad7606.h
@@ -235,10 +235,10 @@ struct ad7606_bus_ops {
int (*iio_backend_config)(struct device *dev, struct iio_dev *indio_dev);
int (*read_block)(struct device *dev, int num, void *data);
int (*sw_mode_config)(struct iio_dev *indio_dev);
- int (*reg_read)(struct ad7606_state *st, unsigned int addr);
- int (*reg_write)(struct ad7606_state *st,
- unsigned int addr,
- unsigned int val);
+ int (*reg_read)(struct iio_dev *indio_dev, unsigned int addr);
+ int (*reg_write)(struct iio_dev *indio_dev,
+ unsigned int addr,
+ unsigned int val);
int (*update_scan_mode)(struct iio_dev *indio_dev, const unsigned long *scan_mask);
u16 (*rd_wr_cmd)(int addr, char isWriteOp);
};
diff --git a/drivers/iio/adc/ad7606_spi.c b/drivers/iio/adc/ad7606_spi.c
index e08563dd1108..15bfa7a427d9 100644
--- a/drivers/iio/adc/ad7606_spi.c
+++ b/drivers/iio/adc/ad7606_spi.c
@@ -124,8 +124,9 @@ static int ad7606_spi_read_block18to32(struct device *dev,
return spi_sync_transfer(spi, &xfer, 1);
}
-static int ad7606_spi_reg_read(struct ad7606_state *st, unsigned int addr)
+static int ad7606_spi_reg_read(struct iio_dev *indio_dev, unsigned int addr)
{
+ struct ad7606_state *st = iio_priv(indio_dev);
struct spi_device *spi = to_spi_device(st->dev);
struct spi_transfer t[] = {
{
@@ -148,10 +149,11 @@ static int ad7606_spi_reg_read(struct ad7606_state *st, unsigned int addr)
return be16_to_cpu(st->d16[1]);
}
-static int ad7606_spi_reg_write(struct ad7606_state *st,
+static int ad7606_spi_reg_write(struct iio_dev *indio_dev,
unsigned int addr,
unsigned int val)
{
+ struct ad7606_state *st = iio_priv(indio_dev);
struct spi_device *spi = to_spi_device(st->dev);
st->d16[0] = cpu_to_be16((st->bops->rd_wr_cmd(addr, 1) << 8) |
@@ -162,8 +164,6 @@ static int ad7606_spi_reg_write(struct ad7606_state *st,
static int ad7616_sw_mode_config(struct iio_dev *indio_dev)
{
- struct ad7606_state *st = iio_priv(indio_dev);
-
/*
* Scale can be configured individually for each channel
* in software mode.
@@ -178,7 +178,7 @@ static int ad7606B_sw_mode_config(struct iio_dev *indio_dev)
struct ad7606_state *st = iio_priv(indio_dev);
/* Configure device spi to output on a single channel */
- st->bops->reg_write(st,
+ st->bops->reg_write(indio_dev,
AD7606_CONFIGURATION_REGISTER,
AD7606_SINGLE_DOUT);
--
2.34.1
