* [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling
@ 2015-02-01 13:02 ` Nicholas Mc Guire
0 siblings, 0 replies; 4+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:02 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 as it just restates "timeout".
Signed-off-by: Nicholas Mc Guire <hofrat-Q945KHDl0DbYtjvyW6yDsg@public.gmane.org>
---
This patch was only compile tested with tegra_defconfig
(implies CONFIG_SPI_TEGRA20_SLINK=y)
Patch is against 3.19.0-rc6 -next-20150130
drivers/spi/spi-tegra20-slink.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 85c91f5..106afe1 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -811,6 +811,7 @@ static int tegra_slink_transfer_one(struct spi_master *master,
{
struct tegra_slink_data *tspi = spi_master_get_devdata(master);
int ret;
+ unsigned long dma_timeout;
reinit_completion(&tspi->xfer_completion);
ret = tegra_slink_start_transfer_one(spi, xfer);
@@ -820,11 +821,10 @@ static int tegra_slink_transfer_one(struct spi_master *master,
return ret;
}
- ret = wait_for_completion_timeout(&tspi->xfer_completion,
+ dma_timeout = wait_for_completion_timeout(&tspi->xfer_completion,
SLINK_DMA_TIMEOUT);
- if (WARN_ON(ret == 0)) {
- dev_err(tspi->dev,
- "spi trasfer timeout, err %d\n", ret);
+ if (WARN_ON(dma_timeout == 0)) {
+ dev_err(tspi->dev, "spi trasfer timeout\n");
return -EIO;
}
--
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] 4+ messages in thread
* [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling
@ 2015-02-01 13:02 ` Nicholas Mc Guire
0 siblings, 0 replies; 4+ messages in thread
From: Nicholas Mc Guire @ 2015-02-01 13:02 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 as it just restates "timeout".
Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---
This patch was only compile tested with tegra_defconfig
(implies CONFIG_SPI_TEGRA20_SLINK=y)
Patch is against 3.19.0-rc6 -next-20150130
drivers/spi/spi-tegra20-slink.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 85c91f5..106afe1 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -811,6 +811,7 @@ static int tegra_slink_transfer_one(struct spi_master *master,
{
struct tegra_slink_data *tspi = spi_master_get_devdata(master);
int ret;
+ unsigned long dma_timeout;
reinit_completion(&tspi->xfer_completion);
ret = tegra_slink_start_transfer_one(spi, xfer);
@@ -820,11 +821,10 @@ static int tegra_slink_transfer_one(struct spi_master *master,
return ret;
}
- ret = wait_for_completion_timeout(&tspi->xfer_completion,
+ dma_timeout = wait_for_completion_timeout(&tspi->xfer_completion,
SLINK_DMA_TIMEOUT);
- if (WARN_ON(ret == 0)) {
- dev_err(tspi->dev,
- "spi trasfer timeout, err %d\n", ret);
+ if (WARN_ON(dma_timeout == 0)) {
+ dev_err(tspi->dev, "spi trasfer timeout\n");
return -EIO;
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling
2015-02-01 13:02 ` Nicholas Mc Guire
@ 2015-02-02 9:03 ` Laxman Dewangan
-1 siblings, 0 replies; 4+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:03 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Mark Brown, Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi, linux-tegra, linux-kernel
On Sunday 01 February 2015 06:32 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 as it just restates "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(ret == 0)) {
> - dev_err(tspi->dev,
> - "spi trasfer timeout, err %d\n", ret);
> + if (WARN_ON(dma_timeout == 0)) {
> + dev_err(tspi->dev, "spi trasfer timeout\n");
trasfer->transfer
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling
@ 2015-02-02 9:03 ` Laxman Dewangan
0 siblings, 0 replies; 4+ messages in thread
From: Laxman Dewangan @ 2015-02-02 9:03 UTC (permalink / raw)
To: Nicholas Mc Guire
Cc: Mark Brown, Stephen Warren, Thierry Reding, Alexandre Courbot,
linux-spi, linux-tegra, linux-kernel
On Sunday 01 February 2015 06:32 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 as it just restates "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(ret == 0)) {
> - dev_err(tspi->dev,
> - "spi trasfer timeout, err %d\n", ret);
> + if (WARN_ON(dma_timeout == 0)) {
> + dev_err(tspi->dev, "spi trasfer timeout\n");
trasfer->transfer
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-02 9:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-01 13:02 [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling Nicholas Mc Guire
2015-02-01 13:02 ` Nicholas Mc Guire
2015-02-02 9:03 ` Laxman Dewangan
2015-02-02 9:03 ` 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.