diff --git a/drivers/gpu/nvgpu/os/linux/ioctl.c b/drivers/gpu/nvgpu/os/linux/ioctl.c
index b1c449727..e0e8bd405 100644
--- a/drivers/gpu/nvgpu/os/linux/ioctl.c
+++ b/drivers/gpu/nvgpu/os/linux/ioctl.c
@@ -222,7 +222,11 @@ static char *nvgpu_devnode(const char *cdev_name)
 	return kasprintf(GFP_KERNEL, "nvhost-%s-gpu", cdev_name);
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
 static char *nvgpu_pci_devnode(struct device *dev, umode_t *mode)
+#else
+static char *nvgpu_pci_devnode(const struct device *dev, umode_t *mode)
+#endif
 {
 	/* Special case to maintain legacy names */
 	if (strcmp(dev_name(dev), "channel") == 0) {
@@ -234,18 +238,30 @@ static char *nvgpu_pci_devnode(struct device *dev, umode_t *mode)
 			dev_name(dev->parent), dev_name(dev));
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
 static char *nvgpu_devnode_v2(struct device *dev, umode_t *mode)
+#else
+static char *nvgpu_devnode_v2(const struct device *dev, umode_t *mode)
+#endif
 {
 	return kasprintf(GFP_KERNEL, "nvgpu/igpu0/%s", dev_name(dev));
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
 static char *nvgpu_pci_devnode_v2(struct device *dev, umode_t *mode)
+#else
+static char *nvgpu_pci_devnode_v2(const struct device *dev, umode_t *mode)
+#endif
 {
 	return kasprintf(GFP_KERNEL, "nvgpu/dgpu-%s/%s", dev_name(dev->parent),
 			dev_name(dev));
 }
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
 static char *nvgpu_mig_fgpu_devnode(struct device *dev, umode_t *mode)
+#else
+static char *nvgpu_mig_fgpu_devnode(const struct device *dev, umode_t *mode)
+#endif
 {
 	struct nvgpu_cdev_class_priv_data *priv_data;