Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 14:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

spi: sh-msiof: cleanup wait_for_completion return handling

Browse Source 
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 assigning it to an incorrect type variable.

Signed-off-by: Nicholas Mc Guire <der.herr@hofr.at>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Nicholas Mc Guire 2015-02-02 03:30:34 -05:00 committed by Mark Brown
parent 65d5665bb2
commit 19f0ad0942
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/spi/spi-sh-msiof.c
View File

@ -636,8 +636,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
} }
/* wait for tx fifo to be emptied / rx fifo to be filled */ /* wait for tx fifo to be emptied / rx fifo to be filled */
ret = wait_for_completion_timeout(&p->done, HZ); if (!wait_for_completion_timeout(&p->done, HZ)) {
if (!ret) {
dev_err(&p->pdev->dev, "PIO timeout\n"); dev_err(&p->pdev->dev, "PIO timeout\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto stop_reset; goto stop_reset;
@ -747,8 +746,7 @@ static int sh_msiof_dma_once(struct sh_msiof_spi_priv *p, const void *tx,
} }
/* wait for tx fifo to be emptied / rx fifo to be filled */ /* wait for tx fifo to be emptied / rx fifo to be filled */
ret = wait_for_completion_timeout(&p->done, HZ); if (!wait_for_completion_timeout(&p->done, HZ)) {
if (!ret) {
dev_err(&p->pdev->dev, "DMA timeout\n"); dev_err(&p->pdev->dev, "DMA timeout\n");
ret = -ETIMEDOUT; ret = -ETIMEDOUT;
goto stop_reset; goto stop_reset;