[PATCH] spi: atmel: cleanup wait_for_completion return handling

[PATCH] spi: atmel: cleanup wait_for_completion return handling

[Nicholas Mc Guire]

return type of wait_for_completion_timeout is unsigned long not int, this
patch adds an appropriate variable and fixes up the assignment.
Further it removes the else branch as the only thing it was
doing is assigning ret to 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 here.

directly rather than adding a additional appropriately typed variable.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---

This patch was only compile tested with at91_dt_defconfig
(implies CONFIG_SPI_ATMEL=y)

Patch is against 3.19.0-rc6 -next-20150130

 drivers/spi/spi-atmel.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 23d8f5f5..fd6744c 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,16 +1104,14 @@ 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,
+		dma_timeout = wait_for_completion_timeout(&as->xfer_completion,
 							SPI_DMA_TIMEOUT);
 		atmel_spi_lock(as);
-		if (WARN_ON(ret == 0)) {
+		if (WARN_ON(dma_timeout == 0)) {
 			dev_err(&spi->dev,
-				"spi trasfer timeout, err %d\n", ret);
+				"spi trasfer timeout\n");
 			as->done_status = -EIO;
-		} else {
-			ret = 0;
-		}
+		}
 
 		if (as->done_status)
 			break;
-- 
1.7.10.4

[PATCH] spi: atmel: cleanup wait_for_completion return handling

[Nicholas Mc Guire]

return type of wait_for_completion_timeout is unsigned long not int, this
patch adds an appropriate variable and fixes up the assignment.
Further it removes the else branch as the only thing it was
doing is assigning ret to 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 here.

directly rather than adding a additional appropriately typed variable.

Signed-off-by: Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>
---

This patch was only compile tested with at91_dt_defconfig
(implies CONFIG_SPI_ATMEL=y)

Patch is against 3.19.0-rc6 -next-20150130

 drivers/spi/spi-atmel.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 23d8f5f5..fd6744c 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,16 +1104,14 @@ 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,
+		dma_timeout = wait_for_completion_timeout(&as->xfer_completion,
 							SPI_DMA_TIMEOUT);
 		atmel_spi_lock(as);
-		if (WARN_ON(ret == 0)) {
+		if (WARN_ON(dma_timeout == 0)) {
 			dev_err(&spi->dev,
-				"spi trasfer timeout, err %d\n", ret);
+				"spi trasfer timeout\n");
 			as->done_status = -EIO;
-		} else {
-			ret = 0;
-		}
+		}
 
 		if (as->done_status)
 			break;
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

On Sun, Feb 01, 2015 at 06:42:11AM -0500, Nicholas Mc Guire wrote:

> return type of wait_for_completion_timeout is unsigned long not int, this
> patch adds an appropriate variable and fixes up the assignment.
> Further it removes the else branch as the only thing it was
> doing is assigning ret to 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 here.
> 
> directly rather than adding a additional appropriately typed variable.

Your commit message appears a bit garbled here...

> Patch is against 3.19.0-rc6 -next-20150130

Which?

>  			as->done_status = -EIO;
> -		} else {
> -			ret = 0;
> -		}
> +		}

This appears to be introducing some whitespace damage, please fix and
resend.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

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

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 819 bytes --]

On Sun, Feb 01, 2015 at 06:42:11AM -0500, Nicholas Mc Guire wrote:

> return type of wait_for_completion_timeout is unsigned long not int, this
> patch adds an appropriate variable and fixes up the assignment.
> Further it removes the else branch as the only thing it was
> doing is assigning ret to 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 here.
> 
> directly rather than adding a additional appropriately typed variable.

Your commit message appears a bit garbled here...

> Patch is against 3.19.0-rc6 -next-20150130

Which?

>  			as->done_status = -EIO;
> -		} else {
> -			ret = 0;
> -		}
> +		}

This appears to be introducing some whitespace damage, please fix and
resend.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]