diff --git a/drivers/gpu/nvgpu/os/linux/debug.c b/drivers/gpu/nvgpu/os/linux/debug.c
index 7479a5f61..5118b939a 100644
--- a/drivers/gpu/nvgpu/os/linux/debug.c
+++ b/drivers/gpu/nvgpu/os/linux/debug.c
@@ -376,10 +376,9 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
 				 l->debugfs,
 				 &g->mm.ltc_enabled_target);
 
-	l->debugfs_poll_timeout_default =
-			debugfs_create_u32("poll_timeout_default_ms",
-					S_IRUGO|S_IWUSR, l->debugfs,
-					 &g->poll_timeout_default);
+	debugfs_create_u32("poll_timeout_default_ms", S_IRUGO|S_IWUSR,
+				l->debugfs, &g->poll_timeout_default);
+
 	l->debugfs_timeouts_enabled =
 			debugfs_create_file("timeouts_enabled",
 					S_IRUGO|S_IWUSR,
@@ -394,21 +393,16 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
 					g,
 					&disable_bigpage_fops);
 
-	l->debugfs_tsg_timeslice_low_priority_us =
-			debugfs_create_u32("tsg_timeslice_low_priority_us",
-					S_IRUGO|S_IWUSR,
-					l->debugfs,
-					&g->tsg_timeslice_low_priority_us);
-	l->debugfs_tsg_timeslice_medium_priority_us =
-			debugfs_create_u32("tsg_timeslice_medium_priority_us",
-					S_IRUGO|S_IWUSR,
-					l->debugfs,
-					&g->tsg_timeslice_medium_priority_us);
-	l->debugfs_tsg_timeslice_high_priority_us =
-			debugfs_create_u32("tsg_timeslice_high_priority_us",
-					S_IRUGO|S_IWUSR,
-					l->debugfs,
-					&g->tsg_timeslice_high_priority_us);
+	debugfs_create_u32("tsg_timeslice_low_priority_us", S_IRUGO|S_IWUSR,
+				l->debugfs, &g->tsg_timeslice_low_priority_us);
+
+	debugfs_create_u32("tsg_timeslice_medium_priority_us", S_IRUGO|S_IWUSR,
+				l->debugfs,
+				&g->tsg_timeslice_medium_priority_us);
+
+	debugfs_create_u32("tsg_timeslice_high_priority_us", S_IRUGO|S_IWUSR,
+				l->debugfs, &g->tsg_timeslice_high_priority_us);
+
 	l->debugfs_runlist_interleave =
 			debugfs_create_bool("runlist_interleave",
 					S_IRUGO|S_IWUSR,
diff --git a/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c b/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c
index da0273dba..401cec8c9 100644
--- a/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c
+++ b/drivers/gpu/nvgpu/os/linux/debug_clk_gm20b.c
@@ -263,15 +263,11 @@ int gm20b_clk_init_debugfs(struct gk20a *g)
 	if (!d)
 		goto err_out;
 
-	d = debugfs_create_u32("pll_na_mode", S_IRUGO, l->debugfs,
+	debugfs_create_u32("pll_na_mode", S_IRUGO, l->debugfs,
 			       (u32 *)&g->clk.gpc_pll.mode);
-	if (!d)
-		goto err_out;
 
-	d = debugfs_create_u32("fmax2x_at_vmin_safe_t", S_IRUGO,
+	debugfs_create_u32("fmax2x_at_vmin_safe_t", S_IRUGO,
 		       l->debugfs, (u32 *)&g->clk.dvfs_safe_max_freq);
-	if (!d)
-		goto err_out;
 
 	return 0;
 
diff --git a/drivers/gpu/nvgpu/os/linux/os_linux.h b/drivers/gpu/nvgpu/os/linux/os_linux.h
index 164dd6332..4d39172c9 100644
--- a/drivers/gpu/nvgpu/os/linux/os_linux.h
+++ b/drivers/gpu/nvgpu/os/linux/os_linux.h
@@ -152,12 +152,8 @@ struct nvgpu_os_linux {
 
 	struct dentry *debugfs_ltc_enabled;
 	struct dentry *debugfs_timeouts_enabled;
-	struct dentry *debugfs_poll_timeout_default;
 	struct dentry *debugfs_disable_bigpage;
 
-	struct dentry *debugfs_tsg_timeslice_low_priority_us;
-	struct dentry *debugfs_tsg_timeslice_medium_priority_us;
-	struct dentry *debugfs_tsg_timeslice_high_priority_us;
 	struct dentry *debugfs_runlist_interleave;
 	struct dentry *debugfs_allocators;
 	struct dentry *debugfs_xve;