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:   Wed, 21 Sep 2022 12:14:50 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Mark Brown <broonie@kernel.org>,
        Liam Girdwood <lgirdwood@gmail.com>,
        Wolfram Sang <wsa@kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Martin =?UTF-8?B?UG92acWhZXI=?= <povik+lin@cutebit.org>,
        Richard Fitzgerald <rf@opensource.cirrus.com>,
        Uwe =?UTF-8?B?S2xlaW5lLUvDtm5pZw==?= 
        <u.kleine-koenig@pengutronix.de>
Subject: linux-next: manual merge of the sound-asoc tree with the i2c tree
Message-ID: <20220921121450.7de65169@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7D/D482tHx3BwjJCQ+j0AR.";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/7D/D482tHx3BwjJCQ+j0AR.
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the sound-asoc tree got a conflict in:

  sound/soc/codecs/cs42l42.c

between commit:

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

from the i2c tree and commits:

  0285042feda7 ("ASoC: cs42l42: Split probe() and remove() into stages")
  ae9f5e607da4 ("ASoC: cs42l42: Split I2C identity into separate module")

from the sound-asoc tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) and can carry the fix as necessary. This is
now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your
tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

=46rom 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_rem=
ove_callback_void-immutable"

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Sep 2022 12:07:39 +1000
Subject: [PATCH] ASoC: cs42l42: fix up for "i2c: Make remove callback retur=
n void"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 sound/soc/codecs/cs42l42-i2c.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/sound/soc/codecs/cs42l42-i2c.c b/sound/soc/codecs/cs42l42-i2c.c
index 1900ec75576e..67b253287daf 100644
--- a/sound/soc/codecs/cs42l42-i2c.c
+++ b/sound/soc/codecs/cs42l42-i2c.c
@@ -41,13 +41,11 @@ static int cs42l42_i2c_probe(struct i2c_client *i2c_cli=
ent)
 	return cs42l42_init(cs42l42);
 }
=20
-static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
+static void cs42l42_i2c_remove(struct i2c_client *i2c_client)
 {
 	struct cs42l42_private *cs42l42 =3D dev_get_drvdata(&i2c_client->dev);
=20
 	cs42l42_common_remove(cs42l42);
-
-	return 0;
 }
=20
 static int __maybe_unused cs42l42_i2c_resume(struct device *dev)
--=20
2.35.1

--=20
Cheers,
Stephen Rothwell

--Sig_/7D/D482tHx3BwjJCQ+j0AR.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmMqc5oACgkQAVBC80lX
0GwhJQf+NtHhkof5L/Ou7kOn7P5h/j+OCVPchVLio9gOS06HOEp60KDV5BRJJRxt
aBukLuOR3ytokSRtnvp6HwuIAMjFjecoNDKRRcn9uQ8WBY4G2rWW7dY2ZHcyGGSF
8CwTnKAAgNWHSJlN2HDC3Y+yzGBSl9ASn+GaE8F4CjT86D/8mknDl6guUOs7wjvK
nZYrMbhg2z7Exno4Vev3Kchh6gBhfBJkwQex6PXEFhKlyj8aDv1uMMJIctfklY7A
3fDQgkP+43GJcKKrziqlA0vwCu1tLoe4fEXLS0Akp6GU2Rb8hPRUyoN1ztxjFZMF
j0oiyKSoVwXXyBdi4gtSfcL7UXK3uw==
=z9ps
-----END PGP SIGNATURE-----

--Sig_/7D/D482tHx3BwjJCQ+j0AR.--