* [PATCH] [v2] nouveau: fix function cast warning
@ 2024-04-04 16:02 Arnd Bergmann
2024-04-05 16:37 ` Danilo Krummrich
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2024-04-04 16:02 UTC (permalink / raw)
To: Karol Herbst, Lyude Paul, Danilo Krummrich
Cc: Arnd Bergmann, David Airlie, Daniel Vetter, Nathan Chancellor,
Nick Desaulniers, Bill Wendling, Justin Stitt, Ben Skeggs,
dri-devel, nouveau, linux-kernel, llvm
From: Arnd Bergmann <arnd@arndb.de>
Calling a function through an incompatible pointer type causes breaks
kcfi, so clang warns about the assignment:
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c:73:10: error: cast from 'void (*)(const void *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
73 | .fini = (void(*)(void *))kfree,
Avoid this with a trivial wrapper.
Fixes: c39f472e9f14 ("drm/nouveau: remove symlinks, move core/ to nvkm/ (no code changes)")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: avoid 'return kfree()' expression returning a void
---
drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
index 4bf486b57101..cb05f7f48a98 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
@@ -66,11 +66,16 @@ of_init(struct nvkm_bios *bios, const char *name)
return ERR_PTR(-EINVAL);
}
+static void of_fini(void *p)
+{
+ kfree(p);
+}
+
const struct nvbios_source
nvbios_of = {
.name = "OpenFirmware",
.init = of_init,
- .fini = (void(*)(void *))kfree,
+ .fini = of_fini,
.read = of_read,
.size = of_size,
.rw = false,
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] [v2] nouveau: fix function cast warning
2024-04-04 16:02 [PATCH] [v2] nouveau: fix function cast warning Arnd Bergmann
@ 2024-04-05 16:37 ` Danilo Krummrich
0 siblings, 0 replies; 2+ messages in thread
From: Danilo Krummrich @ 2024-04-05 16:37 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, David Airlie, Daniel Vetter, Nathan Chancellor,
Nick Desaulniers, Bill Wendling, Justin Stitt, Ben Skeggs,
dri-devel, nouveau, linux-kernel, llvm, Karol Herbst, Lyude Paul
On 4/4/24 18:02, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Calling a function through an incompatible pointer type causes breaks
> kcfi, so clang warns about the assignment:
>
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c:73:10: error: cast from 'void (*)(const void *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
> 73 | .fini = (void(*)(void *))kfree,
>
> Avoid this with a trivial wrapper.
>
> Fixes: c39f472e9f14 ("drm/nouveau: remove symlinks, move core/ to nvkm/ (no code changes)")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied to drm-misc-fixes, thanks!
> ---
> v2: avoid 'return kfree()' expression returning a void
> ---
> drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
> index 4bf486b57101..cb05f7f48a98 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadowof.c
> @@ -66,11 +66,16 @@ of_init(struct nvkm_bios *bios, const char *name)
> return ERR_PTR(-EINVAL);
> }
>
> +static void of_fini(void *p)
> +{
> + kfree(p);
> +}
> +
> const struct nvbios_source
> nvbios_of = {
> .name = "OpenFirmware",
> .init = of_init,
> - .fini = (void(*)(void *))kfree,
> + .fini = of_fini,
> .read = of_read,
> .size = of_size,
> .rw = false,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-05 16:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-04 16:02 [PATCH] [v2] nouveau: fix function cast warning Arnd Bergmann
2024-04-05 16:37 ` Danilo Krummrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox