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-tegra114.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-tegra114.c')
-rw-r--r-- | drivers/spi/spi-tegra114.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-tegra114.c b/drivers/spi/spi-tegra114.c index 9146bb3c2489..aaecfb3ebf58 100644 --- a/drivers/spi/spi-tegra114.c +++ b/drivers/spi/spi-tegra114.c | |||
@@ -451,7 +451,7 @@ static void tegra_spi_dma_complete(void *args) | |||
451 | 451 | ||
452 | static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len) | 452 | static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len) |
453 | { | 453 | { |
454 | INIT_COMPLETION(tspi->tx_dma_complete); | 454 | reinit_completion(&tspi->tx_dma_complete); |
455 | tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan, | 455 | tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan, |
456 | tspi->tx_dma_phys, len, DMA_MEM_TO_DEV, | 456 | tspi->tx_dma_phys, len, DMA_MEM_TO_DEV, |
457 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 457 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
@@ -470,7 +470,7 @@ static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len) | |||
470 | 470 | ||
471 | static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len) | 471 | static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len) |
472 | { | 472 | { |
473 | INIT_COMPLETION(tspi->rx_dma_complete); | 473 | reinit_completion(&tspi->rx_dma_complete); |
474 | tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan, | 474 | tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan, |
475 | tspi->rx_dma_phys, len, DMA_DEV_TO_MEM, | 475 | tspi->rx_dma_phys, len, DMA_DEV_TO_MEM, |
476 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 476 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
@@ -844,7 +844,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master, | |||
844 | list_for_each_entry(xfer, &msg->transfers, transfer_list) { | 844 | list_for_each_entry(xfer, &msg->transfers, transfer_list) { |
845 | unsigned long cmd1; | 845 | unsigned long cmd1; |
846 | 846 | ||
847 | INIT_COMPLETION(tspi->xfer_completion); | 847 | reinit_completion(&tspi->xfer_completion); |
848 | 848 | ||
849 | cmd1 = tegra_spi_setup_transfer_one(spi, xfer, is_first_msg); | 849 | cmd1 = tegra_spi_setup_transfer_one(spi, xfer, is_first_msg); |
850 | 850 | ||