[PATCH 3/8] drm/nouveau: Remove redundant debugfs cleanup

Chris Wilson chris at chris-wilson.co.uk
Sun Jul 7 12:02:20 PDT 2013


All inode removal is handled for us by the core.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Ben Skeggs <bskeggs at redhat.com>
---
 drivers/gpu/drm/nouveau/nouveau_debugfs.c | 7 -------
 drivers/gpu/drm/nouveau/nouveau_debugfs.h | 6 ------
 drivers/gpu/drm/nouveau/nouveau_drm.c     | 1 -
 3 files changed, 14 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index 5392e07..d3f8f23 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -55,10 +55,3 @@ nouveau_debugfs_init(struct drm_minor *minor)
 				 minor->debugfs_root, minor);
 	return 0;
 }
-
-void
-nouveau_debugfs_takedown(struct drm_minor *minor)
-{
-	drm_debugfs_remove_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
-				 minor);
-}
diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
index a62af6f..3cf44f0 100644
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
@@ -5,18 +5,12 @@
 
 #if defined(CONFIG_DEBUG_FS)
 extern int  nouveau_debugfs_init(struct drm_minor *);
-extern void nouveau_debugfs_takedown(struct drm_minor *);
 #else
 static inline int
 nouveau_debugfs_init(struct drm_minor *minor)
 {
        return 0;
 }
-
-static inline void nouveau_debugfs_takedown(struct drm_minor *minor)
-{
-}
-
 #endif
 
 #endif
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 218a4b5..a8b3a28 100644
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -687,7 +687,6 @@ driver = {
 
 #if defined(CONFIG_DEBUG_FS)
 	.debugfs_init = nouveau_debugfs_init,
-	.debugfs_cleanup = nouveau_debugfs_takedown,
 #endif
 
 	.get_vblank_counter = drm_vblank_count,
-- 
1.8.3.2



More information about the dri-devel mailing list