linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Nicholas Mc Guire <hofrat@osadl.org>
To: Mark Brown <broonie@kernel.org>
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
	Nicholas Mc Guire <hofrat@osadl.org>
Subject: [PATCH 2/5] spi: mxs: cleanup wait_for_completion return handling
Date: Mon,  2 Feb 2015 03:30:33 -0500	[thread overview]
Message-ID: <1422865837-10357-2-git-send-email-hofrat@osadl.org> (raw)
In-Reply-To: <1422865837-10357-1-git-send-email-hofrat@osadl.org>

return type of wait_for_completion_timeout is unsigned long not int, this
patch uses the return value of wait_for_completion_timeout in the condition
directly rather than adding a additional appropriately typed variable.

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
---

The return type of wait_for_completion_timeout is unsigned long not
int. This patch resolves the type mismatch by moving the call to
wait_for_completion_timeout into the condition.

This patch was only compile tested with mxs_defconfig

Patch is against 3.19.0-rc6 -next-20150130

 drivers/spi/spi-mxs.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index 4045a1e..d051312 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -282,9 +282,8 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
 	dmaengine_submit(desc);
 	dma_async_issue_pending(ssp->dmach);
 
-	ret = wait_for_completion_timeout(&spi->c,
-				msecs_to_jiffies(SSP_TIMEOUT));
-	if (!ret) {
+	if (!wait_for_completion_timeout(&spi->c,
+	    msecs_to_jiffies(SSP_TIMEOUT))) {
 		dev_err(ssp->dev, "DMA transfer timeout\n");
 		ret = -ETIMEDOUT;
 		dmaengine_terminate_all(ssp->dmach);
-- 
1.7.10.4


  reply	other threads:[~2015-02-02  8:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-02  8:30 [PATCH 1/5] spi: match var type to return type of wait_for_completion Nicholas Mc Guire
2015-02-02  8:30 ` Nicholas Mc Guire [this message]
2015-02-02 12:11   ` [PATCH 2/5] spi: mxs: cleanup wait_for_completion return handling Mark Brown
2015-02-02  8:30 ` [PATCH 3/5] spi: sh-msiof: " Nicholas Mc Guire
2015-02-04 20:53   ` Mark Brown
2015-02-02  8:30 ` [PATCH 4/5] spi: spi-imx: cleanup wait_for_completion handling Nicholas Mc Guire
2015-02-04 20:53   ` Mark Brown
2015-02-02  8:30 ` [PATCH 5/5] spi: ti-qspi: cleanup wait_for_completion return handling Nicholas Mc Guire
2015-02-02 12:16   ` Mark Brown
2015-02-04 20:52 ` [PATCH 1/5] spi: match var type to return type of wait_for_completion Mark Brown

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=1422865837-10357-2-git-send-email-hofrat@osadl.org \
    --to=hofrat@osadl.org \
    --cc=broonie@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    /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;
as well as URLs for NNTP newsgroup(s).