9 files changed, 10 insertions, 10 deletions

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index fd059308affa..8edba9de76df 100644
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -371,7 +371,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev)
         dev_dbg(dev->dev, "transfer: %s %d bytes.\n",
                 (dev->msg->flags & I2C_M_RD) ? "read" : "write", dev->buf_len);
 
-        INIT_COMPLETION(dev->cmd_complete);
+        reinit_completion(&dev->cmd_complete);
         dev->transfer_status = 0;
 
         if (!dev->buf_len) {
diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
index ea4b08fc3353..d7e8600f31fb 100644
--- a/drivers/i2c/busses/i2c-bcm2835.c
+++ b/drivers/i2c/busses/i2c-bcm2835.c
@@ -151,7 +151,7 @@ static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev,
 
         i2c_dev->msg_buf = msg->buf;
         i2c_dev->msg_buf_remaining = msg->len;
-        INIT_COMPLETION(i2c_dev->completion);
+        reinit_completion(&i2c_dev->completion);
 
         bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, BCM2835_I2C_C_CLEAR);
 
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c
index 132369fad4e0..960dec61c64e 100644
--- a/drivers/i2c/busses/i2c-davinci.c
+++ b/drivers/i2c/busses/i2c-davinci.c
@@ -323,7 +323,7 @@ i2c_davinci_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg, int stop)
 
         davinci_i2c_write_reg(dev, DAVINCI_I2C_CNT_REG, dev->buf_len);
 
-        INIT_COMPLETION(dev->cmd_complete);
+        reinit_completion(&dev->cmd_complete);
         dev->cmd_err = 0;
 
         /* Take I2C out of reset and configure it as master */
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 5888feef1ac5..e89e3e2145e5 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -613,7 +613,7 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
         mutex_lock(&dev->lock);
         pm_runtime_get_sync(dev->dev);
 
-        INIT_COMPLETION(dev->cmd_complete);
+        reinit_completion(&dev->cmd_complete);
         dev->msgs = msgs;
         dev->msgs_num = num;
         dev->cmd_err = 0;
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c
index 1672effbcebb..0043ede234c2 100644
--- a/drivers/i2c/busses/i2c-ismt.c
+++ b/drivers/i2c/busses/i2c-ismt.c
@@ -541,7 +541,7 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr,
                 desc->dptr_high = upper_32_bits(dma_addr);
         }
 
-        INIT_COMPLETION(priv->cmp);
+        reinit_completion(&priv->cmp);
 
         /* Add the descriptor */
         ismt_submit_desc(priv);
diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c
index b7c857774708..3aedd86a6468 100644
--- a/drivers/i2c/busses/i2c-mxs.c
+++ b/drivers/i2c/busses/i2c-mxs.c
@@ -505,7 +505,7 @@ static int mxs_i2c_xfer_msg(struct i2c_adapter *adap, struct i2c_msg *msg,
                                 return err;
                 }
         } else {
-                INIT_COMPLETION(i2c->cmd_complete);
+                reinit_completion(&i2c->cmd_complete);
                 ret = mxs_i2c_dma_setup_xfer(adap, msg, flags);
                 if (ret)
                         return ret;
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 9967a6f9c2ff..a6a891d7970d 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -543,7 +543,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
         w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR;
         omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w);
 
-        INIT_COMPLETION(dev->cmd_complete);
+        reinit_completion(&dev->cmd_complete);
         dev->cmd_err = 0;
 
         w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT;
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index c457cb447c66..e661edee4d0c 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -544,7 +544,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,
         i2c_dev->msg_buf_remaining = msg->len;
         i2c_dev->msg_err = I2C_ERR_NONE;
         i2c_dev->msg_read = (msg->flags & I2C_M_RD);
-        INIT_COMPLETION(i2c_dev->msg_complete);
+        reinit_completion(&i2c_dev->msg_complete);
 
         packet_header = (0 << PACKET_HEADER0_HEADER_SIZE_SHIFT) |
                         PACKET_HEADER0_PROTOCOL_I2C |
diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
index c65da3d913a0..31395fa8121d 100644
--- a/drivers/i2c/busses/i2c-wmt.c
+++ b/drivers/i2c/busses/i2c-wmt.c
@@ -158,7 +158,7 @@ static int wmt_i2c_write(struct i2c_adapter *adap, struct i2c_msg *pmsg,
                 writew(val, i2c_dev->base + REG_CR);
         }
 
-        INIT_COMPLETION(i2c_dev->complete);
+        reinit_completion(&i2c_dev->complete);
 
         if (i2c_dev->mode == I2C_MODE_STANDARD)
                 tcr_val = TCR_STANDARD_MODE;
@@ -247,7 +247,7 @@ static int wmt_i2c_read(struct i2c_adapter *adap, struct i2c_msg *pmsg,
                 writew(val, i2c_dev->base + REG_CR);
         }
 
-        INIT_COMPLETION(i2c_dev->complete);
+        reinit_completion(&i2c_dev->complete);
 
         if (i2c_dev->mode == I2C_MODE_STANDARD)
                 tcr_val = TCR_STANDARD_MODE;