[PATCH 2/2] drm/radeon: cleanup debugfs

[Christian König]

Am 11.02.21 um 13:26 schrieb Nirmoy Das:
> 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 at amd.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   drivers/gpu/drm/radeon/radeon.h     |  5 -----
>   drivers/gpu/drm/radeon/radeon_ttm.c | 24 +++++-------------------
>   2 files changed, 5 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
> index f9f550784590..2c0e3e7c294d 100644
> --- a/drivers/gpu/drm/radeon/radeon.h
> +++ b/drivers/gpu/drm/radeon/radeon.h
> @@ -454,11 +454,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 46bf835284f4..9d156b12d24c 100644
> --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> @@ -55,7 +55,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);
>   
>   struct radeon_device *radeon_get_rdev(struct ttm_bo_device *bdev)
>   {
> @@ -793,7 +792,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) {
> @@ -1009,12 +1008,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);
>   
> @@ -1029,15 +1027,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
> -}