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.
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"
From: Stephen Rothwell <[email protected]>
Date: Wed, 21 Sep 2022 12:07:39 +1000
Subject: [PATCH] ASoC: cs42l42: fix up for "i2c: Make remove callback return void"
Signed-off-by: Stephen Rothwell <[email protected]>
---
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_client)
return cs42l42_init(cs42l42);
}
-static int cs42l42_i2c_remove(struct i2c_client *i2c_client)
+static void cs42l42_i2c_remove(struct i2c_client *i2c_client)
{
struct cs42l42_private *cs42l42 = dev_get_drvdata(&i2c_client->dev);
cs42l42_common_remove(cs42l42);
-
- return 0;
}
static int __maybe_unused cs42l42_i2c_resume(struct device *dev)
--
2.35.1
--
Cheers,
Stephen Rothwell