mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nicholas Mc Guire <hofrat@osadl.org>
To: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Mark Brown <broonie@kernel.org>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	Alexandre Courbot <gnurou@gmail.com>,
	linux-spi@vger.kernel.org, linux-tegra@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH 2/2] spi: tegra20-slink: cleanup wait_for_completion return handling
Date: Sun,  1 Feb 2015 08:02:07 -0500	[thread overview]
Message-ID: <1422795727-29097-1-git-send-email-hofrat@osadl.org> (raw)

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


             reply	other threads:[~2015-02-01 13:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-01 13:02 Nicholas Mc Guire [this message]
2015-02-02  9:03 ` Laxman Dewangan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1422795727-29097-1-git-send-email-hofrat@osadl.org \
    --to=hofrat@osadl.org \
    --cc=broonie@kernel.org \
    --cc=gnurou@gmail.com \
    --cc=ldewangan@nvidia.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®