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");