From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Wolfram Sang <wsa@the-dreams•de>,
Mike Turquette <mturquette@baylibre•com>,
Stephen Boyd <sboyd@kernel•org>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix•de>,
"Alex Helms" <alexander.helms.jy@renesas•com>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>
Subject: Re: linux-next: build failure after merge of the i2c tree
Date: Thu, 6 Oct 2022 10:05:37 +1100 [thread overview]
Message-ID: <20221006100537.4d788d1c@canb.auug.org.au> (raw)
In-Reply-To: <20221004112059.5677a13e@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2036 bytes --]
Hi all,
On Tue, 4 Oct 2022 11:20:59 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> 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 <sfr@canb•auug.org.au>
> 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 <sfr@canb•auug.org.au>
> ---
> 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
I have applied this patch to the merge of the clk tree today (since
Linus has merged the i2c tree).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2022-10-05 23:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 0:20 linux-next: build failure after merge of the i2c tree Stephen Rothwell
2022-10-04 6:22 ` Uwe Kleine-König
2022-10-05 23:05 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-06-01 0:32 Stephen Rothwell
2021-06-01 8:55 ` Wolfram Sang
2021-06-01 9:09 ` Hsin-Yi Wang
2021-06-01 9:21 ` Wolfram Sang
2017-11-28 0:02 Stephen Rothwell
2017-11-28 9:53 ` Wolfram Sang
2017-06-26 1:09 Stephen Rothwell
2017-06-26 2:04 ` Shawn Guo
2015-12-16 4:48 Stephen Rothwell
2016-01-04 23:55 ` Stephen Rothwell
2016-01-05 1:04 ` Wolfram Sang
2015-08-25 0:51 Stephen Rothwell
2015-08-26 0:01 ` Dmitry Torokhov
2015-01-16 2:22 Stephen Rothwell
2015-01-16 7:16 ` Pantelis Antoniou
2014-11-24 9:16 Stephen Rothwell
2014-11-24 9:24 ` Wolfram Sang
2013-11-17 23:29 Stephen Rothwell
2011-05-19 3:27 Stephen Rothwell
2011-05-19 9:06 ` Jean Delvare
2010-06-21 2:03 Stephen Rothwell
2010-06-21 5:57 ` Jean Delvare
2010-06-21 7:09 ` Stephen Rothwell
2010-03-01 2:12 Stephen Rothwell
2010-03-01 10:43 ` Jean Delvare
2010-03-02 0:31 ` 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=20221006100537.4d788d1c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alexander.helms.jy@renesas$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mturquette@baylibre$(echo .)com \
--cc=sboyd@kernel$(echo .)org \
--cc=u.kleine-koenig@pengutronix$(echo .)de \
--cc=wsa@the-dreams$(echo .)de \
/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