| Message ID | 1422798911-1626-1-git-send-email-hofrat@osadl.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Sunday 01 February 2015 07:25 PM, 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. > As the string in dev_err already explicitly states "timeout" there > is little point in printing the 0 here which also just says "timeout". > Looks good to me. Thanks for fixing this. I think it is good if we fix the typo here also. Acked-by: Laxman Dewangan <ldewangan@nvidia.com> > + if (WARN_ON(dma_timeout == 0)) { > + dev_err(tspi->dev, "spi trasfer timeout\n"); trasfer->transfer -- To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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; }
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@osadl.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(-)