* [PATCH 1/2] spi: tegra20-sflash: cleanup wait_for_completion return handling
@ 2015-02-01 13:00 Nicholas Mc Guire
0 siblings, 0 replies; 5+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:00 UTC (permalink / raw)
To: Laxman Dewangan
Cc: Mark Brown, Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi, linux-tegra, linux-kernel, Nicholas Mc Guire
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(-)
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;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 1/2] spi: tegra20-sflash: cleanup wait_for_completion return handling
@ 2015-02-01 13:00 Nicholas Mc Guire
2015-02-02 9:00 ` Laxman Dewangan
0 siblings, 1 reply; 5+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:00 UTC (permalink / raw)
To: Laxman Dewangan
Cc: Mark Brown, Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Nicholas Mc Guire
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-Q945KHDl0DbYtjvyW6yDsg@public.gmane.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(-)
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;
}
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] spi: tegra20-sflash: cleanup wait_for_completion return handling
2015-02-01 13:00 Nicholas Mc Guire
@ 2015-02-02 9:00 ` Laxman Dewangan
[not found] ` <54CF3CC5.6030204-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:00 UTC (permalink / raw)
To: Nicholas Mc Guire, Mark Brown
Cc: Stephen Warren, Thierry Reding, Alexandre Courbot, linux-spi,
linux-tegra, linux-kernel
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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-02 9:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-01 13:00 [PATCH 1/2] spi: tegra20-sflash: cleanup wait_for_completion return handling Nicholas Mc Guire
-- strict thread matches above, loose matches on Subject: below --
2015-02-01 13:00 Nicholas Mc Guire
2015-02-02 9:00 ` Laxman Dewangan
[not found] ` <54CF3CC5.6030204-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2015-02-02 9:08 ` Nicholas Mc Guire
2015-02-02 9:15 ` Laxman Dewangan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).