2024-02-13 10:22:22

by Arnd Bergmann

Subject: [PATCH] nvmem: meson-efuse: fix function pointer type mismatch

From: Arnd Bergmann <[email protected]>

clang-16 warns about casting functions to incompatible types, as is done
here to call clk_disable_unprepare:

drivers/nvmem/meson-efuse.c:78:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
78 | (void(*)(void *))clk_disable_unprepare,

Address this with a trivial helper function that adjusts the return code.

Fixes: 611fbca1c861 ("nvmem: meson-efuse: add peripheral clock")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/nvmem/meson-efuse.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c
index b922df99f9bc..3b9e31d7d073 100644
--- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c
@@ -38,6 +38,11 @@ static const struct of_device_id meson_efuse_match[] = {
};
MODULE_DEVICE_TABLE(of, meson_efuse_match);

+static void meson_efuse_clk_disable(void *clk)
+{
+ clk_disable_unprepare(clk);
+}
+
static int meson_efuse_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
@@ -74,9 +79,7 @@ static int meson_efuse_probe(struct platform_device *pdev)
return ret;
}

- ret = devm_add_action_or_reset(dev,
- (void(*)(void *))clk_disable_unprepare,
- clk);
+ ret = devm_add_action_or_reset(dev, meson_efuse_clk_disable, clk);
if (ret) {
dev_err(dev, "failed to add disable callback");
return ret;
--
2.39.2

2024-02-13 10:28:42

by Neil Armstrong

Subject: Re: [PATCH] nvmem: meson-efuse: fix function pointer type mismatch

On 13/02/2024 11:15, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> clang-16 warns about casting functions to incompatible types, as is done
> here to call clk_disable_unprepare:
>
> drivers/nvmem/meson-efuse.c:78:12: error: cast from 'void (*)(struct clk *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
> 78 | (void(*)(void *))clk_disable_unprepare,
>
> Address this with a trivial helper function that adjusts the return code.
>
> Fixes: 611fbca1c861 ("nvmem: meson-efuse: add peripheral clock")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/nvmem/meson-efuse.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/nvmem/meson-efuse.c b/drivers/nvmem/meson-efuse.c
> index b922df99f9bc..3b9e31d7d073 100644
> --- a/drivers/nvmem/meson-efuse.c
> +++ b/drivers/nvmem/meson-efuse.c
> @@ -38,6 +38,11 @@ static const struct of_device_id meson_efuse_match[] = {
> };
> MODULE_DEVICE_TABLE(of, meson_efuse_match);
>
> +static void meson_efuse_clk_disable(void *clk)
> +{
> + clk_disable_unprepare(clk);
> +}
> +
> static int meson_efuse_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> @@ -74,9 +79,7 @@ static int meson_efuse_probe(struct platform_device *pdev)
> return ret;
> }
>
> - ret = devm_add_action_or_reset(dev,
> - (void(*)(void *))clk_disable_unprepare,
> - clk);
> + ret = devm_add_action_or_reset(dev, meson_efuse_clk_disable, clk);
> if (ret) {
> dev_err(dev, "failed to add disable callback");
> return ret;

Reviewed-by: Neil Armstrong <[email protected]>