diff options
| author | Nicholas Mc Guire <der.herr@hofr.at> | 2015-02-02 03:30:34 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-04 20:52:53 +0000 |
| commit | 19f0ad0942d560d33afedc66a27fe7d6e67373dc (patch) | |
| tree | 1e9f74329b0c423e12ff6dadac25ce01c2390252 /drivers/spi/spi-sh-msiof.c | |
| parent | 65d5665bb260b034122061df789497c2d08da6d2 (diff) | |
| download | linux-19f0ad0942d560d33afedc66a27fe7d6e67373dc.tar.gz linux-19f0ad0942d560d33afedc66a27fe7d6e67373dc.tar.bz2 linux-19f0ad0942d560d33afedc66a27fe7d6e67373dc.zip | |
spi: sh-msiof: 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 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>
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
| -rw-r--r-- | drivers/spi/spi-sh-msiof.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c index 9309a396c01e..e57eec0b2f46 100644 --- a/drivers/spi/spi-sh-msiof.c +++ b/drivers/spi/spi-sh-msiof.c @@ -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 */ - ret = wait_for_completion_timeout(&p->done, HZ); - if (!ret) { + if (!wait_for_completion_timeout(&p->done, HZ)) { dev_err(&p->pdev->dev, "PIO timeout\n"); ret = -ETIMEDOUT; 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 */ - ret = wait_for_completion_timeout(&p->done, HZ); - if (!ret) { + if (!wait_for_completion_timeout(&p->done, HZ)) { dev_err(&p->pdev->dev, "DMA timeout\n"); ret = -ETIMEDOUT; goto stop_reset; |