| Message ID | 1422865837-10357-2-git-send-email-hofrat@osadl.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Feb 02, 2015 at 03:30:33AM -0500, Nicholas Mc Guire wrote: > - 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))) { Your new indentation is pretty confusing here, I had to look twice to realize that the msecs_to_jiffies() is still an argument to wait_for_completion(). Generally arguments to functions should be aligned with the opening ( for the function, or at least much more deeply aligned than the function itself (as was the case with the original code).
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);
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(-)