2022-11-04 15:56:19

by Sven Peter

Subject: [PATCH] soc: apple: rtkit: Stop casting function pointer signatures

Fixes: 9bd1d9a0d8bb ("soc: apple: Add RTKit IPC library")
Reported-by: kernel test robot <[email protected]>
Signed-off-by: Sven Peter <[email protected]>
---
drivers/soc/apple/rtkit.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c
index ecc1a818b23d..fa3cda831d2b 100644
--- a/drivers/soc/apple/rtkit.c
+++ b/drivers/soc/apple/rtkit.c
@@ -922,8 +922,10 @@ int apple_rtkit_wake(struct apple_rtkit *rtk)
}
EXPORT_SYMBOL_GPL(apple_rtkit_wake);

-static void apple_rtkit_free(struct apple_rtkit *rtk)
+static void apple_rtkit_free(void *data)
{
+ struct apple_rtkit *rtk = data;
+
mbox_free_channel(rtk->mbox_chan);
destroy_workqueue(rtk->wq);

@@ -946,8 +948,7 @@ struct apple_rtkit *devm_apple_rtkit_init(struct device *dev, void *cookie,
if (IS_ERR(rtk))
return rtk;

- ret = devm_add_action_or_reset(dev, (void (*)(void *))apple_rtkit_free,
- rtk);
+ ret = devm_add_action_or_reset(dev, apple_rtkit_free, rtk);
if (ret)
return ERR_PTR(ret);

--
2.25.1

2022-11-28 11:58:10

by Hector Martin

Subject: Re: [PATCH] soc: apple: rtkit: Stop casting function pointer signatures

On 05/11/2022 00.41, Sven Peter wrote:
> Fixes: 9bd1d9a0d8bb ("soc: apple: Add RTKit IPC library")
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> drivers/soc/apple/rtkit.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/soc/apple/rtkit.c b/drivers/soc/apple/rtkit.c
> index ecc1a818b23d..fa3cda831d2b 100644
> --- a/drivers/soc/apple/rtkit.c
> +++ b/drivers/soc/apple/rtkit.c
> @@ -922,8 +922,10 @@ int apple_rtkit_wake(struct apple_rtkit *rtk)
> }
> EXPORT_SYMBOL_GPL(apple_rtkit_wake);
>
> -static void apple_rtkit_free(struct apple_rtkit *rtk)
> +static void apple_rtkit_free(void *data)
> {
> + struct apple_rtkit *rtk = data;
> +
> mbox_free_channel(rtk->mbox_chan);
> destroy_workqueue(rtk->wq);
>
> @@ -946,8 +948,7 @@ struct apple_rtkit *devm_apple_rtkit_init(struct device *dev, void *cookie,
> if (IS_ERR(rtk))
> return rtk;
>
> - ret = devm_add_action_or_reset(dev, (void (*)(void *))apple_rtkit_free,
> - rtk);
> + ret = devm_add_action_or_reset(dev, apple_rtkit_free, rtk);
> if (ret)
> return ERR_PTR(ret);
>

Applied to asahi-soc/soc, thanks!

- Hector