mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH v2] spi: mxs: cleanup wait_for_completion return handling
@ 2015-02-05 14:47 Nicholas Mc Guire
  2015-02-05 18:05 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Nicholas Mc Guire @ 2015-02-05 14:47 UTC (permalink / raw)
  To: Mark Brown; +Cc: linux-spi, linux-kernel, Nicholas Mc Guire

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>
---

v2: fixup my slightly brain-dead indentation as suggested by Mark Brown 
    <broonie@kernel.org>.

This patch was only compile tested with mxs_defconfig
(implies CONFIG_SPI_MXS=y)

Patch is against 3.19.0-rc7 (localversion-next is -next-20150204)

 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


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] spi: mxs: cleanup wait_for_completion return handling
  2015-02-05 14:47 [PATCH v2] spi: mxs: cleanup wait_for_completion return handling Nicholas Mc Guire
@ 2015-02-05 18:05 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2015-02-05 18:05 UTC (permalink / raw)
  To: Nicholas Mc Guire; +Cc: linux-spi, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

On Thu, Feb 05, 2015 at 09:47:06AM -0500, Nicholas Mc Guire wrote:
> 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.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-02-05 18:05 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-05 14:47 [PATCH v2] spi: mxs: cleanup wait_for_completion return handling Nicholas Mc Guire
2015-02-05 18:05 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome