diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2013-11-14 17:32:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:21 -0500 |
commit | 16735d022f72b20ddbb2274b8e109f69575e9b2b (patch) | |
tree | f567c7dfff06ae18899feab7cd8a79a7a0f7be40 /drivers/spi/spi-tegra20-slink.c | |
parent | c32f74ab2872994bc8336ed367313da3139350ca (diff) |
tree-wide: use reinit_completion instead of INIT_COMPLETION
Use this new function to make code more comprehensible, since we are
reinitialzing the completion, not initializing.
[akpm@linux-foundation.org: linux-next resyncs]
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
-rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index af0a67886ae8..e66715ba37ed 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c | |||
@@ -462,7 +462,7 @@ static void tegra_slink_dma_complete(void *args) | |||
462 | 462 | ||
463 | static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len) | 463 | static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len) |
464 | { | 464 | { |
465 | INIT_COMPLETION(tspi->tx_dma_complete); | 465 | reinit_completion(&tspi->tx_dma_complete); |
466 | tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan, | 466 | tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan, |
467 | tspi->tx_dma_phys, len, DMA_MEM_TO_DEV, | 467 | tspi->tx_dma_phys, len, DMA_MEM_TO_DEV, |
468 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 468 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
@@ -481,7 +481,7 @@ static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len) | |||
481 | 481 | ||
482 | static int tegra_slink_start_rx_dma(struct tegra_slink_data *tspi, int len) | 482 | static int tegra_slink_start_rx_dma(struct tegra_slink_data *tspi, int len) |
483 | { | 483 | { |
484 | INIT_COMPLETION(tspi->rx_dma_complete); | 484 | reinit_completion(&tspi->rx_dma_complete); |
485 | tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan, | 485 | tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan, |
486 | tspi->rx_dma_phys, len, DMA_DEV_TO_MEM, | 486 | tspi->rx_dma_phys, len, DMA_DEV_TO_MEM, |
487 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 487 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
@@ -836,7 +836,7 @@ static int tegra_slink_transfer_one(struct spi_master *master, | |||
836 | struct tegra_slink_data *tspi = spi_master_get_devdata(master); | 836 | struct tegra_slink_data *tspi = spi_master_get_devdata(master); |
837 | int ret; | 837 | int ret; |
838 | 838 | ||
839 | INIT_COMPLETION(tspi->xfer_completion); | 839 | reinit_completion(&tspi->xfer_completion); |
840 | ret = tegra_slink_start_transfer_one(spi, xfer); | 840 | ret = tegra_slink_start_transfer_one(spi, xfer); |
841 | if (ret < 0) { | 841 | if (ret < 0) { |
842 | dev_err(tspi->dev, | 842 | dev_err(tspi->dev, |