Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 26 Aug 2022 15:26:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Linus Walleij <linus.walleij@linaro.org>,
        Wolfram Sang <wsa@the-dreams.de>
Cc:     Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>, Wolfram Sang <wsa@kernel.org>,
        Naresh Solanki <naresh.solanki@9elements.com>,
        Patrick Rudolph <patrick.rudolph@9elements.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 pinctrl tree
Message-ID: <20220826152650.2c55e482@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Pt.EyoV_KiVpO//lk/pLu.E";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/Pt.EyoV_KiVpO//lk/pLu.E
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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

drivers/pinctrl/pinctrl-cy8c95x0.c:1371:27: error: initialization of 'void =
(*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2=
c_client *)' [-Werror=3Dincompatible-pointer-types]
 1371 |         .remove         =3D cy8c95x0_remove,
      |                           ^~~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-cy8c95x0.c:1371:27: note: (near initialization for =
'cy8c95x0_driver.remove')

Caused by commit

  e6cbbe42944d ("pinctrl: Add Cypress cy8c95x0 support")

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: Fri, 26 Aug 2022 15:20:29 +1000
Subject: [PATCH] pinctrl: fixup for "i2c: Make remove callback return void"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pinctrl/pinctrl-cy8c95x0.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-c=
y8c95x0.c
index a29df0920f4f..05791212822e 100644
--- a/drivers/pinctrl/pinctrl-cy8c95x0.c
+++ b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -1352,14 +1352,12 @@ static int cy8c95x0_probe(struct i2c_client *client)
 	return ret;
 }
=20
-static int cy8c95x0_remove(struct i2c_client *client)
+static void cy8c95x0_remove(struct i2c_client *client)
 {
 	struct cy8c95x0_pinctrl *chip =3D i2c_get_clientdata(client);
=20
 	if (!IS_ERR_OR_NULL(chip->regulator))
 		regulator_disable(chip->regulator);
-
-	return 0;
 }
=20
 static struct i2c_driver cy8c95x0_driver =3D {
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/Pt.EyoV_KiVpO//lk/pLu.E
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMIWZoACgkQAVBC80lX
0GwyoQf+K3lskLtGcSNNWW/fgt95/GEUcAe2L9+WXziZvSey4Dqb3fSgaqQWbUS+
t9IrQ2ZF3POCdycx9Op43EEcCGDj59v5IWOgXV03NfClztoRkqVUIZ9X7Xvyh3Hl
dX68zlbAurHPmsROF4BCLKFmyo7YzrKGhavoKAtApu8H5DcRvuq8HN4crzhqQB3o
GVM9xTGcgRzhO+ZP7yJ+8VEWJLKjNfQnVjJrEazy58EBiNwvawUBGcikferuIcWb
LZzWGbXX4UxwcWQSiI+60V9cyo8+4yAGQaCxEW6ldaHhUsawiu1CB9dTYsUtjn/2
z7ZdDF3GQ2ikOuJf0D0wfOoXLVzSCA==
=Kel7
-----END PGP SIGNATURE-----

--Sig_/Pt.EyoV_KiVpO//lk/pLu.E--