From: Nicholas Mc Guire Date: Thu, 5 Feb 2015 14:47:06 +0000 (-0500) Subject: spi: mxs: cleanup wait_for_completion return handling X-Git-Tag: firefly_0821_release~176^2~2405^2~3^6 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f2234691d7d7c6154f6d850365cf6cf63cc6eb74;p=firefly-linux-kernel-4.4.55.git spi: mxs: cleanup wait_for_completion return handling 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 Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index 4045a1e580e1..5b0e9a3e83f6 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);