2020-02-27 12:26:18

by Sergiu Cuciurean

Subject: [PATCH] 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 <[email protected]>
---
drivers/iio/adc/max1118.c | 10 ++++++++--
1 file 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,
--
2.17.1

2020-03-01 15:50:56

by Jonathan Cameron

Subject: Re: [PATCH] iio: adc: max1118: Use new structure for SPI transfer delays

On Thu, 27 Feb 2020 14:25:15 +0200
Sergiu Cuciurean <[email protected]> wrote:

> 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 <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing for the
autobuilders to play with it.

Thanks,

Jonathan

> ---
> drivers/iio/adc/max1118.c | 10 ++++++++--
> 1 file 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,