Subject: Re: linux-next: build failure after merge of the staging tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 26 Apr 2021 11:29:45 +1000

Hi all,

On Mon, 29 Mar 2021 16:55:25 +1100 Stephen Rothwell <[email-masked]> wrote:
>
> After merging the staging tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_read_reg':
> drivers/iio/adc/ti-ads131e08.c:180:5: error: 'struct spi_transfer' has no member named 'delay_usecs'
>   180 |    .delay_usecs = st->sdecode_delay_us,
>       |     ^~~~~~~~~~~
> drivers/iio/adc/ti-ads131e08.c: In function 'ads131e08_write_reg':
> drivers/iio/adc/ti-ads131e08.c:206:5: error: 'struct spi_transfer' has no member named 'delay_usecs'
>   206 |    .delay_usecs = st->sdecode_delay_us,
>       |     ^~~~~~~~~~~
> 
> Caused by commit
> 
>   d935eddd2799 ("iio: adc: Add driver for Texas Instruments ADS131E0x ADC family")
> 
> interacting with commit
> 
>   3ab1cce55337 ("spi: core: remove 'delay_usecs' field from spi_transfer")
> 
> from the spi tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <[email-masked]>
> Date: Mon, 29 Mar 2021 16:51:22 +1100
> Subject: [PATCH] iio: adc: merge fix for "spi: core: remove 'delay_usecs'
>  field from spi_transfer"
> 
> Signed-off-by: Stephen Rothwell <[email-masked]>
> ---
>  drivers/iio/adc/ti-ads131e08.c | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/adc/ti-ads131e08.c b/drivers/iio/adc/ti-ads131e08.c
> index 0060d5f0abb0..764dab087b41 100644
> --- a/drivers/iio/adc/ti-ads131e08.c
> +++ b/drivers/iio/adc/ti-ads131e08.c
> @@ -177,7 +177,10 @@ static int ads131e08_read_reg(struct ads131e08_state *st, u8 reg)
>  		{
>  			.tx_buf = &st->tx_buf,
>  			.len = 2,
> -			.delay_usecs = st->sdecode_delay_us,
> +			.delay = {
> +				.value = st->sdecode_delay_us,
> +				.unit = SPI_DELAY_UNIT_USECS,
> +			},
>  		}, {
>  			.rx_buf = &st->rx_buf,
>  			.len = 1,
> @@ -203,7 +206,10 @@ static int ads131e08_write_reg(struct ads131e08_state *st, u8 reg, u8 value)
>  		{
>  			.tx_buf = &st->tx_buf,
>  			.len = 3,
> -			.delay_usecs = st->sdecode_delay_us,
> +			.delay = {
> +				.value = st->sdecode_delay_us,
> +				.unit = SPI_DELAY_UNIT_USECS,
> +			},
>  		}
>  	};
>  
> -- 
> 2.30.0

With the merge window opening, this is a reminder that I am still
applying the above fix to the merge of the staging tree.

-- 
Cheers,
Stephen Rothwell