* [PATCH] spi: tegra114: cleanup wait_for_completion return handling
@ 2015-02-01 13:55 ` Nicholas Mc Guire
0 siblings, 0 replies; 5+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:55 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 explicitly states "timeout" there
is little point in printing the 0 here which also just says "timeout".
Signed-off-by: Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.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(-)
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;
}
--
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
* [PATCH] spi: tegra114: cleanup wait_for_completion return handling
@ 2015-02-01 13:55 ` Nicholas Mc Guire
0 siblings, 0 replies; 5+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:55 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 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(-)
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;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] spi: tegra114: cleanup wait_for_completion return handling
2015-02-01 13:55 ` Nicholas Mc Guire
(?)
@ 2015-02-02 9:04 ` Laxman Dewangan
-1 siblings, 0 replies; 5+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:04 UTC (permalink / raw)
To: Nicholas Mc Guire, Mark Brown
Cc: Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> + 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-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 [flat|nested] 5+ messages in thread
* Re: [PATCH] spi: tegra114: cleanup wait_for_completion return handling
@ 2015-02-02 9:04 ` Laxman Dewangan
0 siblings, 0 replies; 5+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:04 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 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] spi: tegra114: cleanup wait_for_completion return handling
@ 2015-02-02 9:04 ` Laxman Dewangan
0 siblings, 0 replies; 5+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:04 UTC (permalink / raw)
To: Nicholas Mc Guire, Mark Brown
Cc: Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi-u79uwXL29TY76Z2rM5mHXA,
linux-tegra-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> + 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-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 [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-02-02 9:05 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:55 [PATCH] spi: tegra114: cleanup wait_for_completion return handling Nicholas Mc Guire
2015-02-01 13:55 ` Nicholas Mc Guire
[not found] ` <1422798911-1626-1-git-send-email-hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>
2015-02-02 9:04 ` Laxman Dewangan
2015-02-02 9:04 ` Laxman Dewangan
2015-02-02 9:04 ` Laxman Dewangan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.