Hi all,
After merging the sound-asoc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
sound/soc/codecs/cs42l83-i2c.c:234:19: error: initialization of 'void (*)(struct i2c_client *)' from incompatible pointer type 'int (*)(struct i2c_client *)' [-Werror=incompatible-pointer-types]
234 | .remove = cs42l83_i2c_remove,
| ^~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs42l83-i2c.c:234:19: note: (near initialization for 'cs42l83_i2c_driver.remove')
Caused by commit
94d5f62a91aa ("ASoC: cs42l83: Extend CS42L42 support to new part")
interacting with commit
ed5c2f5fd10d ("i2c: Make remove callback return void")
from the i2c tree.
I applied the following merge fix patch:
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Wed, 21 Sep 2022 12:24:03 +1000
Subject: [PATCH] ASoC: cs42l83: fix up for "i2c: Make remove callback return
void"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
sound/soc/codecs/cs42l83-i2c.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sound/soc/codecs/cs42l83-i2c.c b/sound/soc/codecs/cs42l83-i2c.c
index ba8772aa51e1..f90d43996a51 100644
--- a/sound/soc/codecs/cs42l83-i2c.c
+++ b/sound/soc/codecs/cs42l83-i2c.c
@@ -192,13 +192,11 @@ static int cs42l83_i2c_probe(struct i2c_client *i2c_client)
return cs42l42_init(cs42l83);
}
-static int cs42l83_i2c_remove(struct i2c_client *i2c_client)
+static void cs42l83_i2c_remove(struct i2c_client *i2c_client)
{
struct cs42l42_private *cs42l83 = dev_get_drvdata(&i2c_client->dev);
cs42l42_common_remove(cs42l83);
-
- return 0;
}
static int __maybe_unused cs42l83_i2c_resume(struct device *dev)
--
2.35.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpyFePXlGJAO.pgp
Description: OpenPGP digital signature
