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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 Oct 2022 11:20:59 +1100

Hi all,

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

drivers/clk/clk-versaclock7.c:1304:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
 1304 |         .remove = vc7_remove,
      |                   ^~~~~~~~~~
drivers/clk/clk-versaclock7.c:1304:19: note: (near initialization for 'vc7_i2c_driver.remove')

Caused by commit

  48c5e98fedd9 ("clk: Renesas versaclock7 ccf device driver")

from the clk tree interacting with commit

  ed5c2f5fd10d ("i2c: Make remove callback return void")

from the i2c tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <[email-masked]>
Date: Tue, 4 Oct 2022 11:13:45 +1100
Subject: [PATCH] clk: fix up for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 drivers/clk/clk-versaclock7.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/clk/clk-versaclock7.c b/drivers/clk/clk-versaclock7.c
index 050807cf971f..8e4f86e852aa 100644
--- a/drivers/clk/clk-versaclock7.c
+++ b/drivers/clk/clk-versaclock7.c
@@ -1235,14 +1235,12 @@ static int vc7_probe(struct i2c_client *client)
 	return ret;
 }
 
-static int vc7_remove(struct i2c_client *client)
+static void vc7_remove(struct i2c_client *client)
 {
 	struct vc7_driver_data *vc7 = i2c_get_clientdata(client);
 
 	of_clk_del_provider(client->dev.of_node);
 	clk_unregister_fixed_rate(vc7->clk_apll.clk);
-
-	return 0;
 }
 
 static bool vc7_volatile_reg(struct device *dev, unsigned int reg)
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell