Messages in this thread Patch in this message | | | From | Nicholas Mc Guire <> | Subject | [PATCH 1/2 v3] spi: tegra20-sflash: cleanup wait_for_completion return handling | Date | Mon, 2 Feb 2015 04:51:52 -0500 |
| |
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.
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> ---
v2: typo fixed as suggested by Laxman Dewangan <ldewangan@nvidia.com> v3: merged dev_err into one line as suggested by Laxman Dewangan <ldewangan@nvidia.com>
This patch was only compile tested with tegra_defconfig (implies CONFIG_SPI_TEGRA20_SFLASH=y)
Patch is against 3.19.0-rc6 -next-20150202
drivers/spi/spi-tegra20-sflash.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index b6558bb..c23d3d4 100644 --- a/drivers/spi/spi-tegra20-sflash.c +++ b/drivers/spi/spi-tegra20-sflash.c @@ -323,6 +323,7 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master, struct spi_transfer *xfer; struct spi_device *spi = msg->spi; int ret; + unsigned long dma_timeout; msg->status = 0; msg->actual_length = 0; @@ -337,11 +338,10 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master, goto exit; } is_first_msg = false; - ret = wait_for_completion_timeout(&tsd->xfer_completion, + dma_timeout = wait_for_completion_timeout(&tsd->xfer_completion, SPI_DMA_TIMEOUT); - if (WARN_ON(ret == 0)) { - dev_err(tsd->dev, - "spi trasfer timeout, err %d\n", ret); + if (WARN_ON(dma_timeout == 0)) { + dev_err(tsd->dev, "spi transfer timeout\n"); ret = -EIO; goto exit; } -- 1.7.10.4
| |