lkml.org 
[lkml]   [2015]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/2 v2] spi: tegra20-slink: cleanup wait_for_completion return handling
Date
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@osadl.org>
---

v2: typo fixed as suggested by Laxman Dewangan <ldewangan@nvidia.com>

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 transfer timeout\n");
return -EIO;
}

--
1.7.10.4


\
 
 \ /
  Last update: 2015-02-02 10:41    [W:0.045 / U:0.764 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site