15 files changed, 20 insertions, 20 deletions

diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c
index 4c332143a310..3ed666fe840a 100644
--- a/drivers/spi/spi-bcm2835.c
+++ b/drivers/spi/spi-bcm2835.c
@@ -217,7 +217,7 @@ static int bcm2835_spi_start_transfer(struct spi_device *spi,
                 cs |= spi->chip_select;
         }
 
-        INIT_COMPLETION(bs->done);
+        reinit_completion(&bs->done);
         bs->tx_buf = tfr->tx_buf;
         bs->rx_buf = tfr->rx_buf;
         bs->len = tfr->len;
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index e2a5a426b2ef..6f03d7e6435d 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -105,7 +105,7 @@ static int spi_clps711x_transfer_one_message(struct spi_master *master,
 
                 gpio_set_value(cs, !!(msg->spi->mode & SPI_CS_HIGH));
 
-                INIT_COMPLETION(hw->done);
+                reinit_completion(&hw->done);
 
                 hw->count = 0;
                 hw->len = xfer->len;
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index dd72445ba2ea..50b2d88c8190 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -554,7 +554,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_POWERDOWN_MASK);
         set_io_bits(dspi->base + SPIGCR1, SPIGCR1_SPIENA_MASK);
 
-        INIT_COMPLETION(dspi->done);
+        reinit_completion(&dspi->done);
 
         if (spicfg->io_type == SPI_IO_TYPE_INTR)
                 set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT);
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 32200d4f8780..80d8f40f7e05 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -232,7 +232,7 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
         mpc8xxx_spi->tx = t->tx_buf;
         mpc8xxx_spi->rx = t->rx_buf;
 
-        INIT_COMPLETION(mpc8xxx_spi->done);
+        reinit_completion(&mpc8xxx_spi->done);
 
         /* Set SPCOM[CS] and SPCOM[TRANLEN] field */
         if ((t->len - 1) > SPCOM_TRANLEN_MAX) {
diff --git a/drivers/spi/spi-fsl-spi.c b/drivers/spi/spi-fsl-spi.c
index 2129fcd1c31b..119f7af94537 100644
--- a/drivers/spi/spi-fsl-spi.c
+++ b/drivers/spi/spi-fsl-spi.c
@@ -339,7 +339,7 @@ static int fsl_spi_bufs(struct spi_device *spi, struct spi_transfer *t,
         mpc8xxx_spi->tx = t->tx_buf;
         mpc8xxx_spi->rx = t->rx_buf;
 
-        INIT_COMPLETION(mpc8xxx_spi->done);
+        reinit_completion(&mpc8xxx_spi->done);
 
         if (mpc8xxx_spi->flags & SPI_CPM_MODE)
                 ret = fsl_spi_cpm_bufs(mpc8xxx_spi, t, is_dma_mapped);
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 58d5ee0e4443..9602bbd8d7ea 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -167,7 +167,7 @@ static int mpc512x_psc_spi_transfer_rxtx(struct spi_device *spi,
                         }
 
                         /* have the ISR trigger when the TX FIFO is empty */
-                        INIT_COMPLETION(mps->txisrdone);
+                        reinit_completion(&mps->txisrdone);
                         out_be32(&fifo->txisr, MPC512x_PSC_FIFO_EMPTY);
                         out_be32(&fifo->tximr, MPC512x_PSC_FIFO_EMPTY);
                         wait_for_completion(&mps->txisrdone);
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index de333059a9a7..73afb56c08cc 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -202,7 +202,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi,
         if (!dma_xfer)
                 return -ENOMEM;
 
-        INIT_COMPLETION(spi->c);
+        reinit_completion(&spi->c);
 
         /* Chip select was already programmed into CTRL0 */
         ctrl0 = readl(ssp->base + HW_SSP_CTRL0);
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 9e2020df9e0f..4c4b0a1219a7 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -890,7 +890,7 @@ static int s3c64xx_spi_transfer_one(struct spi_master *master,
         unsigned long flags;
         int use_dma;
 
-        INIT_COMPLETION(sdd->xfer_completion);
+                reinit_completion(&sdd->xfer_completion);
 
         /* Only BPW and Speed may change across transfers */
         bpw = xfer->bits_per_word;
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 2a95435a6a11..c74298cf70e2 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -465,7 +465,7 @@ static int sh_msiof_spi_txrx_once(struct sh_msiof_spi_priv *p,
         ret = ret ? ret : sh_msiof_modify_ctr_wait(p, 0, CTR_TXE);
 
         /* start by setting frame bit */
-        INIT_COMPLETION(p->done);
+        reinit_completion(&p->done);
         ret = ret ? ret : sh_msiof_modify_ctr_wait(p, 0, CTR_TFSE);
         if (ret) {
                 dev_err(&p->pdev->dev, "failed to start hardware\n");
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 592b4aff651f..ed5e501c4652 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -305,8 +305,8 @@ static int spi_sirfsoc_transfer(struct spi_device *spi, struct spi_transfer *t)
         sspi->tx = t->tx_buf ? t->tx_buf : sspi->dummypage;
         sspi->rx = t->rx_buf ? t->rx_buf : sspi->dummypage;
         sspi->left_tx_word = sspi->left_rx_word = t->len / sspi->word_width;
-        INIT_COMPLETION(sspi->rx_done);
-        INIT_COMPLETION(sspi->tx_done);
+        reinit_completion(&sspi->rx_done);
+        reinit_completion(&sspi->tx_done);
 
         writel(SIRFSOC_SPI_INT_MASK_ALL, sspi->base + SIRFSOC_SPI_INT_STATUS);
 
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)
 
 static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->tx_dma_complete);
+        reinit_completion(&tspi->tx_dma_complete);
         tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan,
                                 tspi->tx_dma_phys, len, DMA_MEM_TO_DEV,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -470,7 +470,7 @@ static int tegra_spi_start_tx_dma(struct tegra_spi_data *tspi, int len)
 
 static int tegra_spi_start_rx_dma(struct tegra_spi_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->rx_dma_complete);
+        reinit_completion(&tspi->rx_dma_complete);
         tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan,
                                 tspi->rx_dma_phys, len, DMA_DEV_TO_MEM,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -844,7 +844,7 @@ static int tegra_spi_transfer_one_message(struct spi_master *master,
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                 unsigned long cmd1;
 
-                INIT_COMPLETION(tspi->xfer_completion);
+                reinit_completion(&tspi->xfer_completion);
 
                 cmd1 = tegra_spi_setup_transfer_one(spi, xfer, is_first_msg);
 
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 79be8ce6a9d1..4dc8e8129459 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -339,7 +339,7 @@ static int tegra_sflash_transfer_one_message(struct spi_master *master,
         msg->actual_length = 0;
         single_xfer = list_is_singular(&msg->transfers);
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
-                INIT_COMPLETION(tsd->xfer_completion);
+                reinit_completion(&tsd->xfer_completion);
                 ret = tegra_sflash_start_transfer_one(spi, xfer,
                                         is_first_msg, single_xfer);
                 if (ret < 0) {
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)
 
 static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->tx_dma_complete);
+        reinit_completion(&tspi->tx_dma_complete);
         tspi->tx_dma_desc = dmaengine_prep_slave_single(tspi->tx_dma_chan,
                                 tspi->tx_dma_phys, len, DMA_MEM_TO_DEV,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -481,7 +481,7 @@ static int tegra_slink_start_tx_dma(struct tegra_slink_data *tspi, int len)
 
 static int tegra_slink_start_rx_dma(struct tegra_slink_data *tspi, int len)
 {
-        INIT_COMPLETION(tspi->rx_dma_complete);
+        reinit_completion(&tspi->rx_dma_complete);
         tspi->rx_dma_desc = dmaengine_prep_slave_single(tspi->rx_dma_chan,
                                 tspi->rx_dma_phys, len, DMA_DEV_TO_MEM,
                                 DMA_PREP_INTERRUPT |  DMA_CTRL_ACK);
@@ -836,7 +836,7 @@ static int tegra_slink_transfer_one(struct spi_master *master,
         struct tegra_slink_data *tspi = spi_master_get_devdata(master);
         int ret;
 
-        INIT_COMPLETION(tspi->xfer_completion);
+        reinit_completion(&tspi->xfer_completion);
         ret = tegra_slink_start_transfer_one(spi, xfer);
         if (ret < 0) {
                 dev_err(tspi->dev,
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index ec3a83f52ea2..6d4ce4615163 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -258,7 +258,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
         xspi->tx_ptr = t->tx_buf;
         xspi->rx_ptr = t->rx_buf;
         xspi->remaining_bytes = t->len;
-        INIT_COMPLETION(xspi->done);
+        reinit_completion(&xspi->done);
 
 
         /* Enable the transmit empty interrupt, which we use to determine
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 927998aa5e71..8d85ddc46011 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -571,7 +571,7 @@ static int spi_transfer_one_message(struct spi_master *master,
         list_for_each_entry(xfer, &msg->transfers, transfer_list) {
                 trace_spi_transfer_start(msg, xfer);
 
-                INIT_COMPLETION(master->xfer_completion);
+                reinit_completion(&master->xfer_completion);
 
                 ret = master->transfer_one(master, msg->spi, xfer);
                 if (ret < 0) {