| Message ID | 1422795604-29004-1-git-send-email-hofrat@osadl.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sunday 01 February 2015 06:30 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 states "timeout" there > is little point in printing the 0 here. > > Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> 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(tsd->dev, > - "spi trasfer timeout, err %d\n", ret); > + "spi trasfer timeout\n"); trasfer -> transfer. -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, 02 Feb 2015, Laxman Dewangan wrote: > On Sunday 01 February 2015 06:30 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 states "timeout" there >> is little point in printing the 0 here. >> >> Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> > > 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(tsd->dev, >> - "spi trasfer timeout, err %d\n", ret); >> + "spi trasfer timeout\n"); > > trasfer -> transfer. > > overlooked that - sorry - will fix it up and resubmit. thx! hofrat -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Monday 02 February 2015 02:38 PM, Nicholas Mc Guire wrote: > On Mon, 02 Feb 2015, Laxman Dewangan wrote: > >> >>> + if (WARN_ON(dma_timeout == 0)) { >>> dev_err(tsd->dev, >>> - "spi trasfer timeout, err %d\n", ret); >>> + "spi trasfer timeout\n"); >> trasfer -> transfer. >> >> > overlooked that - sorry - will fix it up and resubmit. > Thanks, And possibly we will be able to merge two lines into single one i.e. single line error message. -- To unsubscribe from this list: send the line "unsubscribe linux-spi" 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-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c index b6558bb..48a7c74 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,11 @@ 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)) { + if (WARN_ON(dma_timeout == 0)) { dev_err(tsd->dev, - "spi trasfer timeout, err %d\n", ret); + "spi trasfer timeout\n"); ret = -EIO; goto exit; }
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> --- This patch was only compile tested with tegra_defconfig (implies CONFIG_SPI_TEGRA20_SFLASH=y) Patch is against 3.19.0-rc6 -next-20150130 drivers/spi/spi-tegra20-sflash.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)