From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Guenter Roeck <linux@roeck-us.net>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Wolfram Sang" <wsa@kernel.org>,
"Michael Shych" <michaelsh@nvidia.com>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
"Linux Next Mailing List" <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the hwmon-staging tree
Date: Wed, 31 Aug 2022 09:30:10 +1000 [thread overview]
Message-ID: <20220831093010.10ce62a0@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1978 bytes --]
Hi all,
After merging the hwmon-staging tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/hwmon/emc2305.c:615:21: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
615 | .remove = emc2305_remove,
| ^~~~~~~~~~~~~~
drivers/hwmon/emc2305.c:615:21: note: (near initialization for 'emc2305_driver.remove')
Caused by commit
324745b64626 ("hwmon: (emc2305) add support for EMC2301/2/3/5 RPM-based PWM Fan Speed Controller.")
interacting with commit
ed5c2f5fd10d ("i2c: Make remove callback return void")
from the i2c tree.
From Uwe:
> There is an immutable tag that can be merged into your tree to
> resolve the conflict before you send your changes to Linux at
>
> https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Aug 2022 09:22:50 +1000
Subject: [PATCH] hwmon: (emc2305) fix up for "i2c: Make remove callback return void"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/hwmon/emc2305.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/hwmon/emc2305.c b/drivers/hwmon/emc2305.c
index 9f6546ea3d69..df4c5816f661 100644
--- a/drivers/hwmon/emc2305.c
+++ b/drivers/hwmon/emc2305.c
@@ -597,13 +597,12 @@ static int emc2305_probe(struct i2c_client *client, const struct i2c_device_id *
return 0;
}
-static int emc2305_remove(struct i2c_client *client)
+static void emc2305_remove(struct i2c_client *client)
{
struct device *dev = &client->dev;
if (IS_REACHABLE(CONFIG_THERMAL))
emc2305_unset_tz(dev);
- return 0;
}
static struct i2c_driver emc2305_driver = {
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-08-30 23:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-30 23:30 Stephen Rothwell [this message]
2022-08-31 12:03 ` linux-next: build failure after merge of the hwmon-staging tree Michael Shych
-- strict thread matches above, loose matches on Subject: below --
2023-07-27 5:41 Stephen Rothwell
2023-01-24 22:24 Stephen Rothwell
2023-01-24 22:27 ` Guenter Roeck
2022-05-10 12:26 Stephen Rothwell
2020-10-01 2:53 Stephen Rothwell
2020-10-01 15:09 ` Guenter Roeck
2020-08-24 0:28 Stephen Rothwell
2020-08-24 7:01 ` Guenter Roeck
2020-04-28 6:36 Stephen Rothwell
2020-04-28 13:19 ` Guenter Roeck
2020-03-22 23:37 Stephen Rothwell
2020-03-22 23:45 ` Guenter Roeck
2019-02-25 23:55 Stephen Rothwell
2019-02-26 0:11 ` Guenter Roeck
2018-12-16 23:00 Stephen Rothwell
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=20220831093010.10ce62a0@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=michaelsh@nvidia.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).