Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[linux-drm-fsl-dcu.git] / drivers / i2c / busses / i2c-bcm-kona.c

diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
index eb1ce6e4523a291bb8a808379556780c9e666725..036cf03aeb612a7c62641c65e94552eb6c09af04 100644 (file)
--- a/drivers/i2c/busses/i2c-bcm-kona.c
+++ b/drivers/i2c/busses/i2c-bcm-kona.c
@@ -265,7 +265,7 @@ static int bcm_kona_send_i2c_cmd(struct bcm_kona_i2c_dev *dev,
        writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
 
        /* Mark as incomplete before sending the command */
-       INIT_COMPLETION(dev->done);
+       reinit_completion(&dev->done);
 
        /* Send the command */
        bcm_kona_i2c_send_cmd_to_ctrl(dev, cmd);
@@ -295,7 +295,7 @@ static int bcm_kona_i2c_read_fifo_single(struct bcm_kona_i2c_dev *dev,
        unsigned long time_left = msecs_to_jiffies(I2C_TIMEOUT);
 
        /* Mark as incomplete before starting the RX FIFO */
-       INIT_COMPLETION(dev->done);
+       reinit_completion(&dev->done);
 
        /* Unmask the read complete interrupt */
        writel(IER_READ_COMPLETE_INT_MASK, dev->base + IER_OFFSET);
@@ -372,7 +372,7 @@ static int bcm_kona_i2c_write_byte(struct bcm_kona_i2c_dev *dev, uint8_t data,
        writel(IER_I2C_INT_EN_MASK, dev->base + IER_OFFSET);
 
        /* Mark as incomplete before sending the data */
-       INIT_COMPLETION(dev->done);
+       reinit_completion(&dev->done);
 
        /* Send one byte of data */
        writel(data, dev->base + DAT_OFFSET);
@@ -407,7 +407,7 @@ static int bcm_kona_i2c_write_fifo_single(struct bcm_kona_i2c_dev *dev,
        unsigned int fifo_status;
 
        /* Mark as incomplete before sending data to the TX FIFO */
-       INIT_COMPLETION(dev->done);
+       reinit_completion(&dev->done);
 
        /* Unmask the fifo empty and nak interrupt */
        writel(IER_FIFO_INT_EN_MASK | IER_NOACK_EN_MASK,