diff options
| author | Sergiu Cuciurean <sergiu.cuciurean@analog.com> | 2020-02-27 14:25:15 +0200 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2020-03-08 17:28:44 +0000 |
| commit | 5f0ea0f5a63c6f6f4d9cdc458b0c5da5edfcb705 (patch) | |
| tree | 59919dcb7be061be034eb1c138a8849f45d89399 /drivers/iio | |
| parent | e89602c32e195ea1b256fc33a2c522deb46bfedb (diff) | |
| download | linux-stable-5f0ea0f5a63c6f6f4d9cdc458b0c5da5edfcb705.tar.gz linux-stable-5f0ea0f5a63c6f6f4d9cdc458b0c5da5edfcb705.tar.bz2 linux-stable-5f0ea0f5a63c6f6f4d9cdc458b0c5da5edfcb705.zip | |
iio: adc: max1118: Use new structure for SPI transfer delays
In a recent change to the SPI subsystem [1], a new `delay` struct was added
to replace the `delay_usecs`. This change replaces the current
`delay_usecs` with `delay` for this driver.
The `spi_transfer_delay_exec()` function [in the SPI framework] makes sure
that both `delay_usecs` & `delay` are used (in this order to preserve
backwards compatibility).
[1] commit bebcfd272df6 ("spi: introduce `delay` field for
`spi_transfer` + spi_transfer_delay_exec()")
Signed-off-by: Sergiu Cuciurean <sergiu.cuciurean@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/adc/max1118.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/iio/adc/max1118.c b/drivers/iio/adc/max1118.c index 3b6f3b9a6c5b..0c5d7aaf6826 100644 --- a/drivers/iio/adc/max1118.c +++ b/drivers/iio/adc/max1118.c @@ -71,7 +71,10 @@ static int max1118_read(struct spi_device *spi, int channel) */ { .len = 0, - .delay_usecs = 1, /* > CNVST Low Time 100 ns */ + .delay = { /* > CNVST Low Time 100 ns */ + .value = 1, + .unit = SPI_DELAY_UNIT_USECS + }, .cs_change = 1, }, /* @@ -81,7 +84,10 @@ static int max1118_read(struct spi_device *spi, int channel) */ { .len = 0, - .delay_usecs = 8, + .delay = { + .value = 8, + .unit = SPI_DELAY_UNIT_USECS + }, }, { .rx_buf = &adc->data, |