[PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Uwe Kleine-König]

Commit ed5c2f5fd10d ("i2c: Make remove callback return void") changed
the prototype of ams_i2c_remove() but failed to adapt the declaration.
Catch up and fix the declaration accordingly.

Fixes: ed5c2f5fd10d ("i2c: Make remove callback return void")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,

the kernel test robot found a regression. I checked the kernel tree and
(assuming I did it correctly) there are no other instances where I
missed to adapt a declaration.

I don't know how to proceed with this fix. Squashing into the broken
commit is out of the game as the commit is on a stable branch that is
already merged in a few trees. Maybe let it go in via the i2c tree?

Best regards
Uwe

 drivers/macintosh/ams/ams-i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/macintosh/ams/ams-i2c.c b/drivers/macintosh/ams/ams-i2c.c
index 362fc56b69dc..3ded340699fb 100644
--- a/drivers/macintosh/ams/ams-i2c.c
+++ b/drivers/macintosh/ams/ams-i2c.c
@@ -58,7 +58,7 @@ enum ams_i2c_cmd {
 
 static int ams_i2c_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id);
-static int ams_i2c_remove(struct i2c_client *client);
+static void ams_i2c_remove(struct i2c_client *client);
 
 static const struct i2c_device_id ams_id[] = {
 	{ "MAC,accelerometer_1", 0 },
-- 
2.37.2

Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]


> I don't know how to proceed with this fix. Squashing into the broken
> commit is out of the game as the commit is on a stable branch that is
> already merged in a few trees. Maybe let it go in via the i2c tree?

I think it would be simplest if I put it on top of my for-next branch.
The other option is that PPC pulls the immutable branch

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

and then applies this patch on top. I don't mind.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]


> I don't know how to proceed with this fix. Squashing into the broken
> commit is out of the game as the commit is on a stable branch that is
> already merged in a few trees. Maybe let it go in via the i2c tree?

I think it would be simplest if I put it on top of my for-next branch.
The other option is that PPC pulls the immutable branch

git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

and then applies this patch on top. I don't mind.


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Michael Ellerman]

Wolfram Sang <wsa@kernel.org> writes:
>> I don't know how to proceed with this fix. Squashing into the broken
>> commit is out of the game as the commit is on a stable branch that is
>> already merged in a few trees. Maybe let it go in via the i2c tree?
>
> I think it would be simplest if I put it on top of my for-next branch.

Yeah please do.

An ack if you need it:

Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)


cheers

Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

On Fri, Sep 16, 2022 at 11:08:02AM +0200, Uwe Kleine-König wrote:
> Commit ed5c2f5fd10d ("i2c: Make remove callback return void") changed
> the prototype of ams_i2c_remove() but failed to adapt the declaration.
> Catch up and fix the declaration accordingly.
> 
> Fixes: ed5c2f5fd10d ("i2c: Make remove callback return void")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 486 bytes --]

On Fri, Sep 16, 2022 at 11:08:02AM +0200, Uwe Kleine-König wrote:
> Commit ed5c2f5fd10d ("i2c: Make remove callback return void") changed
> the prototype of ams_i2c_remove() but failed to adapt the declaration.
> Catch up and fix the declaration accordingly.
> 
> Fixes: ed5c2f5fd10d ("i2c: Make remove callback return void")
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Applied to for-next, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]