Commit 117c3611 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by sanglipeng1
Browse files

nouveau: fix function cast warnings 

stable inclusion
from stable-v5.10.211
commit fc30793e0610c28d3b80f2559f719b7ea37b8b1b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAF2J4

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=fc30793e0610c28d3b80f2559f719b7ea37b8b1b



--------------------------------

[ Upstream commit 0affdba22aca5573f9d989bcb1d71d32a6a03efe ]

clang-16 warns about casting between incompatible function types:

drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c:161:10: error: cast from 'void (*)(const struct firmware *)' to 'void (*)(void *)' converts to incompatible function type [-Werror,-Wcast-function-type-strict]
  161 |         .fini = (void(*)(void *))release_firmware,

This one was done to use the generic shadow_fw_release() function as a
callback for struct nvbios_source. Change it to use the same prototype
as the other five instances, with a trivial helper function that actually
calls release_firmware.

Fixes: 70c0f263 ("drm/nouveau/bios: pull in basic vbios subdev, more to come later")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDanilo Krummrich <dakr@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240213095753.455062-1-arnd@kernel.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent e73a6ba4

drivers/gpu/drm/nouveau/nvkm/subdev/bios/shadow.c

+7 −1
Original line number Diff line number Diff line
@@ -154,11 +154,17 @@ shadow_fw_init(struct nvkm_bios *bios, const char *name) 
	return (void *)fw;

}



static void

shadow_fw_release(void *fw)

{

	release_firmware(fw);

}



static const struct nvbios_source

shadow_fw = {

	.name = "firmware",

	.init = shadow_fw_init,

	.fini = (void(*)(void *))release_firmware,

	.fini = shadow_fw_release,

	.read = shadow_fw_read,

	.rw = false,

};