Re: [PATCH v2] spi: atmel: cleanup wait_for_completion return handling

[Nicolas Ferre <nicolas.ferre@atmel.com>]

Le 02/02/2015 16:43, Nicholas Mc Guire a écrit :
> return type of wait_for_completion_timeout is unsigned long not int, this
> patch adds an appropriate variable and fixes up the assignment. It removes 
> the else branch as the only thing it was doing is assigning ret = 0; - but 
> ret is never used thereafter so that is not needed. As the string in 
> dev_err already states "timeout" there is little point in printing the 0. 
> A typo in "trasfer" -> transfer is also fixed.
> 
> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Thanks. Bye.

> ---
> 
> v2: fixes commit message and whitespace damage reported by
>     Mark Brown <broonie@kernel.org>
> 
> This patch was only compile tested with at91_dt_defconfig
> (implies CONFIG_SPI_ATMEL=y)
> 
> Patch is against 3.19.0-rc6 (localversion-next = -next-20150202)
> 
>  drivers/spi/spi-atmel.c |   12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 23d8f5f5..9af7841 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -1046,6 +1046,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
>  	struct atmel_spi_device	*asd;
>  	int			timeout;
>  	int			ret;
> +	unsigned long		dma_timeout;
>  
>  	as = spi_master_get_devdata(master);
>  
> @@ -1103,15 +1104,12 @@ static int atmel_spi_one_transfer(struct spi_master *master,
>  
>  		/* interrupts are disabled, so free the lock for schedule */
>  		atmel_spi_unlock(as);
> -		ret = wait_for_completion_timeout(&as->xfer_completion,
> -							SPI_DMA_TIMEOUT);
> +		dma_timeout = wait_for_completion_timeout(&as->xfer_completion,
> +							  SPI_DMA_TIMEOUT);
>  		atmel_spi_lock(as);
> -		if (WARN_ON(ret == 0)) {
> -			dev_err(&spi->dev,
> -				"spi trasfer timeout, err %d\n", ret);
> +		if (WARN_ON(dma_timeout == 0)) {
> +			dev_err(&spi->dev, "spi transfer timeout\n");
>  			as->done_status = -EIO;
> -		} else {
> -			ret = 0;
>  		}
>  
>  		if (as->done_status)
> 


-- 
Nicolas Ferre