drm/radeon: cleanup debugfs

Remove unnecessary debugfs dentries and also radeon_ttm_debugfs_fini()
as drm_debugfs_cleanup() will recursively remove debugfs files.

Signed-off-by: Nirmoy Das <nirmoy.das@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index f09989b..fddd61d 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -453,11 +453,6 @@ struct radeon_surface_reg {
 struct radeon_mman {
        struct ttm_bo_device            bdev;
        bool                            initialized;
-
-#if defined(CONFIG_DEBUG_FS)
-       struct dentry                   *vram;
-       struct dentry                   *gtt;
-#endif
 };
 
 struct radeon_bo_list {

diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
index e8c66d1..aab3e5f 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_ttm.c
+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
@@ -53,7 +53,6 @@
 #include "radeon_ttm.h"
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
-static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);
 
 static int radeon_ttm_tt_bind(struct ttm_bo_device *bdev,
                              struct ttm_tt *ttm,
@@ -777,7 +776,7 @@ void radeon_ttm_fini(struct radeon_device *rdev)
 
        if (!rdev->mman.initialized)
                return;
-       radeon_ttm_debugfs_fini(rdev);
+
        if (rdev->stolen_vga_memory) {
                r = radeon_bo_reserve(rdev->stolen_vga_memory, false);
                if (r == 0) {
@@ -1010,12 +1009,11 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
        struct drm_minor *minor = rdev->ddev->primary;
        struct dentry *root = minor->debugfs_root;
 
-       rdev->mman.vram = debugfs_create_file("radeon_vram", S_IFREG | S_IRUGO,
-                                             root, rdev,
-                                             &radeon_ttm_vram_fops);
+       debugfs_create_file("radeon_vram", S_IFREG | S_IRUGO, root, rdev,
+                           &radeon_ttm_vram_fops);
 
-       rdev->mman.gtt = debugfs_create_file("radeon_gtt", S_IFREG | S_IRUGO,
-                                            root, rdev, &radeon_ttm_gtt_fops);
+       debugfs_create_file("radeon_gtt", S_IFREG | S_IRUGO, root, rdev,
+                           &radeon_ttm_gtt_fops);
 
        count = ARRAY_SIZE(radeon_ttm_debugfs_list);
 
@@ -1025,15 +1023,3 @@ static int radeon_ttm_debugfs_init(struct radeon_device *rdev)
        return 0;
 #endif
 }
-
-static void radeon_ttm_debugfs_fini(struct radeon_device *rdev)
-{
-#if defined(CONFIG_DEBUG_FS)
-
-       debugfs_remove(rdev->mman.vram);
-       rdev->mman.vram = NULL;
-
-       debugfs_remove(rdev->mman.gtt);
-       rdev->mman.gtt = NULL;
-#endif
-}