linux-next: build failure after merge of the i2c tree

[Stephen Rothwell]

Hi Wolfram,

After merging the i2c tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/i2c/busses/i2c-bcm-kona.c: In function 'bcm_kona_send_i2c_cmd':
drivers/i2c/busses/i2c-bcm-kona.c:268:2: error: implicit declaration of function 'INIT_COMPLETION' [-Werror=implicit-function-declaration]

Caused by commit 93d17247118c ("i2c: bcm-kona: Introduce Broadcom I2C
Driver") interacting with commit 62026aedaace ("sched: remove
INIT_COMPLETION") from Linus` tree.

I have applied the following merge fix patch and can carry it as
necessary (please inform Linus of this when you ask him to merge your
tree).

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 18 Nov 2013 10:26:37 +1100
Subject: [PATCH] i2c: bcm-kona: fix for INIT_COMPLETION -> reinit_completion
 API change

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/i2c/busses/i2c-bcm-kona.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/i2c/busses/i2c-bcm-kona.c b/drivers/i2c/busses/i2c-bcm-kona.c
index 7b7b7622b0d1..865e5dd9e655 100644
--- 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,
-- 
1.8.4.3

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature