[PATCH] drm/amdgpu: fix ras ctrl debugfs node leak

[Chen, Guchun]

Use debugfs_remove_recursive to remove the whole debugfs
directory instead of removing the node one by one.

Change-Id: I27e9edab20d568b16d0163f8c7c3d81fb6832acd
Signed-off-by: Guchun Chen <guchun.c...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 12 +++++-------
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 5f06f1e645c7..0a90e5cb3ca4 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -978,10 +978,10 @@ static void amdgpu_ras_debugfs_create_ctrl_node(struct 
amdgpu_device *adev)
        struct drm_minor *minor = adev->ddev->primary;
 
        con->dir = debugfs_create_dir("ras", minor->debugfs_root);
-       con->ent = debugfs_create_file("ras_ctrl", S_IWUGO | S_IRUGO, con->dir,
-                                      adev, &amdgpu_ras_debugfs_ctrl_ops);
-       con->ent = debugfs_create_file("ras_eeprom_reset", S_IWUGO | S_IRUGO, 
con->dir,
-                                              adev, 
&amdgpu_ras_debugfs_eeprom_ops);
+       debugfs_create_file("ras_ctrl", S_IWUGO | S_IRUGO, con->dir,
+                               adev, &amdgpu_ras_debugfs_ctrl_ops);
+       debugfs_create_file("ras_eeprom_reset", S_IWUGO | S_IRUGO, con->dir,
+                               adev, &amdgpu_ras_debugfs_eeprom_ops);
 }
 
 void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
@@ -1026,10 +1026,8 @@ static void amdgpu_ras_debugfs_remove_all(struct 
amdgpu_device *adev)
                amdgpu_ras_debugfs_remove(adev, &obj->head);
        }
 
-       debugfs_remove(con->ent);
-       debugfs_remove(con->dir);
+       debugfs_remove_recursive(con->dir);
        con->dir = NULL;
-       con->ent = NULL;
 }
 /* debugfs end */
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index dd5da3c6327e..ae386c466c0e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -317,8 +317,6 @@ struct amdgpu_ras {
        struct list_head head;
        /* debugfs */
        struct dentry *dir;
-       /* debugfs ctrl */
-       struct dentry *ent;
        /* sysfs */
        struct device_attribute features_attr;
        struct bin_attribute badpages_attr;
-- 
2.17.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx