From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Dmitry Torokhov <dmitry.torokhov@gmail•com>
Cc: "Eddie James" <eajames@linux•ibm.com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
"Wolfram Sang" <wsa@kernel•org>
Subject: linux-next: build failure after merge of the input tree
Date: Wed, 17 Aug 2022 10:00:07 +1000 [thread overview]
Message-ID: <20220817100007.2827652a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1627 bytes --]
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@canb•auug.org.au>
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@canb•auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-08-17 0:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-17 0:00 Stephen Rothwell [this message]
2022-08-17 0:07 ` linux-next: build failure after merge of the input tree Stephen Rothwell
2022-08-17 4:43 ` Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2026-03-25 16:22 Mark Brown
2026-03-25 16:25 ` Dmitry Torokhov
2025-07-02 3:47 Stephen Rothwell
2025-07-02 4:01 ` Dmitry Torokhov
2022-10-24 23:00 Stephen Rothwell
2022-10-25 5:02 ` Dmitry Torokhov
2022-08-01 21:44 broonie
2022-08-04 12:33 ` Mark Brown
2022-08-04 23:36 ` Jiri Kosina
2022-04-27 0:48 Stephen Rothwell
2022-04-27 6:53 ` Fabien Parent
2022-04-27 7:35 ` Lee Jones
2022-04-27 7:41 ` Fabien Parent
2022-05-02 2:17 ` Stephen Rothwell
2022-05-06 0:25 ` Dmitry Torokhov
2022-05-31 10:13 ` Fabien Parent
2020-03-25 7:16 Stephen Rothwell
2020-03-31 21:06 ` Stephen Rothwell
2015-10-16 2:19 Stephen Rothwell
2015-10-16 7:37 ` Hans de Goede
2015-10-17 16:39 ` Dmitry Torokhov
2015-07-24 1:49 Stephen Rothwell
2015-07-24 2:33 ` Dmitry Torokhov
2012-10-05 1:47 Stephen Rothwell
2012-10-05 6:12 ` Dmitry Torokhov
2012-01-24 3:25 Stephen Rothwell
2012-01-24 6:59 ` Dmitry Torokhov
2012-01-24 23:16 ` John Stultz
2010-08-19 1:35 Stephen Rothwell
2010-08-19 5:19 ` Dmitry Torokhov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220817100007.2827652a@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=eajames@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
--cc=wsa@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox