linux-kernel - [PATCH] spi: tegra114: cleanup wait_for

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1422798911-1626-1-git-send-email-hofrat@osadl.org>
Date:	Sun,  1 Feb 2015 08:55:11 -0500
From:	Nicholas Mc Guire <hofrat@...dl.org>
To:	Laxman Dewangan <ldewangan@...dia.com>
Cc:	Mark Brown <broonie@...nel.org>,
	Stephen Warren <swarren@...dotorg.org>,
	Thierry Reding <thierry.reding@...il.com>,
	Alexandre Courbot <gnurou@...il.com>,
	linux-spi@...r.kernel.org, linux-tegra@...r.kernel.org,
	linux-kernel@...r.kernel.org, Nicholas Mc Guire <hofrat@...dl.org>
Subject: [PATCH] spi: tegra114: cleanup wait_for_completion return handling

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 explicitly states "timeout" there
is little point in printing the 0 here which also just says "timeout".

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

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

Patch is against 3.19.0-rc6 -next-20150130

 drivers/spi/spi-tegra114.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c
index 73779ce..0dfb422 100644
--- a/drivers/spi/spi-tegra114.c
+++ b/drivers/spi/spi-tegra114.c
@@ -807,6 +807,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
 	struct spi_transfer *xfer;
 	struct spi_device *spi = msg->spi;
 	int ret;
+	unsigned long dma_timeout;
 	bool skip = false;
 
 	msg->status = 0;
@@ -833,11 +834,10 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
 		}
 
 		is_first_msg = false;
-		ret = wait_for_completion_timeout(&tspi->xfer_completion,
-						SPI_DMA_TIMEOUT);
-		if (WARN_ON(ret == 0)) {
-			dev_err(tspi->dev,
-				"spi trasfer timeout, err %d\n", ret);
+		dma_timeout = wait_for_completion_timeout(
+				&tspi->xfer_completion, SPI_DMA_TIMEOUT);
+		if (WARN_ON(dma_timeout == 0)) {
+			dev_err(tspi->dev, "spi trasfer timeout\n");
 			ret = -EIO;
 			goto complete_xfer;
 		}
-- 
1.7.10.4

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