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

[Stephen Rothwell]

Hi all,

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

drivers/input/misc/ibm-panel.c:195:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
  195 |         .remove = ibm_panel_remove,
      |                   ^~~~~~~~~~~~~~~~
drivers/input/misc/ibm-panel.c:195:19: note: (near initialization for 'ibm_panel_driver.remove')

Caused by commit

  95331e91e9da ("Input: Add IBM Operation Panel driver")

interacting with commit

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

from v6.0-rc1.

I have applied the following merge fix patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 17 Aug 2022 09:54:11 +1000
Subject: [PATCH] Input: fix up for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/input/misc/ibm-panel.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/input/misc/ibm-panel.c b/drivers/input/misc/ibm-panel.c
index 54c657cd7809..094bcdb568f1 100644
--- a/drivers/input/misc/ibm-panel.c
+++ b/drivers/input/misc/ibm-panel.c
@@ -174,11 +174,9 @@ static int ibm_panel_probe(struct i2c_client *client,
 	return 0;
 }
 
-static int ibm_panel_remove(struct i2c_client *client)
+static void ibm_panel_remove(struct i2c_client *client)
 {
 	i2c_slave_unregister(client);
-
-	return 0;
 }
 
 static const struct of_device_id ibm_panel_match[] = {
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Attachment: pgp8oAPVojYTX.pgp
Description: OpenPGP digital signature