Commit 1369dea6 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Mark Brown

spi: atmel: cleanup wait_for_completion return handling

return type of wait_for_completion_timeout is unsigned long not int, this
patch adds an appropriate variable and fixes up the assignment. It removes
the else branch as the only thing it was doing is assigning ret = 0; - but
ret is never used thereafter so that is not needed. As the string in
dev_err already states "timeout" there is little point in printing the 0.
A typo in "trasfer" -> transfer is also fixed.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 97bf6af1
...@@ -1046,6 +1046,7 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1046,6 +1046,7 @@ static int atmel_spi_one_transfer(struct spi_master *master,
struct atmel_spi_device *asd; struct atmel_spi_device *asd;
int timeout; int timeout;
int ret; int ret;
unsigned long dma_timeout;
as = spi_master_get_devdata(master); as = spi_master_get_devdata(master);
...@@ -1103,15 +1104,12 @@ static int atmel_spi_one_transfer(struct spi_master *master, ...@@ -1103,15 +1104,12 @@ static int atmel_spi_one_transfer(struct spi_master *master,
/* interrupts are disabled, so free the lock for schedule */ /* interrupts are disabled, so free the lock for schedule */
atmel_spi_unlock(as); atmel_spi_unlock(as);
ret = wait_for_completion_timeout(&as->xfer_completion, dma_timeout = wait_for_completion_timeout(&as->xfer_completion,
SPI_DMA_TIMEOUT); SPI_DMA_TIMEOUT);
atmel_spi_lock(as); atmel_spi_lock(as);
if (WARN_ON(ret == 0)) { if (WARN_ON(dma_timeout == 0)) {
dev_err(&spi->dev, dev_err(&spi->dev, "spi transfer timeout\n");
"spi trasfer timeout, err %d\n", ret);
as->done_status = -EIO; as->done_status = -EIO;
} else {
ret = 0;
} }
if (as->done_status) if (as->done_status)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment