diff --git a/drivers/media/platform/tegra/cdi/cdi_mgr.c b/drivers/media/platform/tegra/cdi/cdi_mgr.c
index cb422568..76f4f218 100644
--- a/drivers/media/platform/tegra/cdi/cdi_mgr.c
+++ b/drivers/media/platform/tegra/cdi/cdi_mgr.c
@@ -1487,10 +1487,10 @@ static struct cdi_mgr_platform_data *of_cdi_mgr_pdata(struct platform_device
 	return pd;
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0)
-static char *cdi_mgr_devnode(struct device *dev, umode_t *mode)
-#else
+#if defined(NV_CLASS_STRUCT_DEVNODE_HAS_CONST_DEV_ARG) /* Linux v6.2 */
 static char *cdi_mgr_devnode(const struct device *dev, umode_t *mode)
+#else
+static char *cdi_mgr_devnode(struct device *dev, umode_t *mode)
 #endif
 {
 	if (!mode)
diff --git a/drivers/media/platform/tegra/isc/isc_mgr.c b/drivers/media/platform/tegra/isc/isc_mgr.c
index 8474e7cc..06f12787 100644
--- a/drivers/media/platform/tegra/isc/isc_mgr.c
+++ b/drivers/media/platform/tegra/isc/isc_mgr.c
@@ -18,7 +18,6 @@
 #include <asm/siginfo.h>
 #include <linux/rcupdate.h>
 #include <linux/sched.h>
-#include <linux/version.h>
 #include <linux/sched/signal.h>
 #include <linux/uaccess.h>
 #include <linux/atomic.h>
@@ -957,10 +956,10 @@ static struct isc_mgr_platform_data *of_isc_mgr_pdata(struct platform_device
 	return pd;
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 2, 0))
-static char *isc_mgr_devnode(struct device *dev, umode_t *mode)
-#else
+#if defined(NV_CLASS_STRUCT_DEVNODE_HAS_CONST_DEV_ARG) /* Linux v6.2 */
 static char *isc_mgr_devnode(const struct device *dev, umode_t *mode)
+#else
+static char *isc_mgr_devnode(struct device *dev, umode_t *mode)
 #endif
 {
 	if (!mode)
diff --git a/scripts/conftest/conftest.sh b/scripts/conftest/conftest.sh
index 893a45f2..7ef60daa 100755
--- a/scripts/conftest/conftest.sh
+++ b/scripts/conftest/conftest.sh
@@ -6521,7 +6521,7 @@ compile_test() {
             # Determine if the 'class' structure devnode function pointer
             # has const 'struct dev' argument.
             #
-            # Commit 43a7206b0963 ("driver core: class: make class_register()
+            # Commit ff62b8e6588f ("driver core: make struct class.devnode()
             # take a const *") updated the class_register function to take a
             # const class structure in Linux v6.2.
             #