[PATCH 2/2] spi: tegra20-slink: 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.
As the string in dev_err already states "timeout" there is little point in
printing the 0 here as it just restates "timeout".

Signed-off-by: Nicholas Mc Guire <hofrat@xxxxxxxxx>
---

This patch was only compile tested with tegra_defconfig
(implies CONFIG_SPI_TEGRA20_SLINK=y)

Patch is against 3.19.0-rc6 -next-20150130

 drivers/spi/spi-tegra20-slink.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 85c91f5..106afe1 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -811,6 +811,7 @@ static int tegra_slink_transfer_one(struct spi_master *master,
 {
 	struct tegra_slink_data *tspi = spi_master_get_devdata(master);
 	int ret;
+	unsigned long dma_timeout;
 
 	reinit_completion(&tspi->xfer_completion);
 	ret = tegra_slink_start_transfer_one(spi, xfer);
@@ -820,11 +821,10 @@ static int tegra_slink_transfer_one(struct spi_master *master,
 		return ret;
 	}
 
-	ret = wait_for_completion_timeout(&tspi->xfer_completion,
+	dma_timeout = wait_for_completion_timeout(&tspi->xfer_completion,
 					  SLINK_DMA_TIMEOUT);
-	if (WARN_ON(ret == 0)) {
-		dev_err(tspi->dev,
-			"spi trasfer timeout, err %d\n", ret);
+	if (WARN_ON(dma_timeout == 0)) {
+		dev_err(tspi->dev, "spi trasfer timeout\n");
 		return -EIO;
 	}
 
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/