From 41e6fae71ed74d76b6de5b56c3d92859ef16c9f7 Mon Sep 17 00:00:00 2001 From: Jon Hunter Date: Tue, 14 Nov 2023 13:37:53 +0000 Subject: [PATCH] gpu: nvgpu: Use conftest test for class_create A test has already been added to the conftest script for checking if the class_create() function has a module pointer argument or not. So use the definition generated by conftest to select which version of the function to use. Bug 4221847 Bug 4276500 Change-Id: If4b4445b2dfb2ec6556ca8c4ef9931e6b8833357 Signed-off-by: Jon Hunter Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/3015846 (cherry picked from commit cf745fa6d89a277dc8fb72454b9a7d26454e8b8d) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/3017318 Reviewed-by: Sagar Kamble GVS: Gerrit_Virtual_Submit --- drivers/gpu/nvgpu/os/linux/ioctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/os/linux/ioctl.c b/drivers/gpu/nvgpu/os/linux/ioctl.c index c158d2f63..cbc11ec0f 100644 --- a/drivers/gpu/nvgpu/os/linux/ioctl.c +++ b/drivers/gpu/nvgpu/os/linux/ioctl.c @@ -438,10 +438,10 @@ static struct nvgpu_class *nvgpu_create_class(struct gk20a *g, const char *class return NULL; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)) - class->class = class_create(THIS_MODULE, class_name); -#else +#if defined(NV_CLASS_CREATE_HAS_NO_OWNER_ARG) /* Linux v6.4 */ class->class = class_create(class_name); +#else + class->class = class_create(THIS_MODULE, class_name); #endif if (IS_ERR(class->class)) { nvgpu_err(g, "failed to create class");