[PATCH 03/19] drm/atomic: Remove drm_atomic_debugfs_cleanup()

[Daniel Vetter]

On Thu, Jan 26, 2017 at 11:56:05PM +0100, Noralf Trønnes wrote:
> drm_debugfs_cleanup() now removes all minor->debugfs_list entries
> automatically, so no need to call drm_debugfs_remove_files().
> 
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>

Merged up to this one to drm-misc, I'll wait with the others for acks to
trickle in.

Thanks a lot, Daniel
> ---
>  drivers/gpu/drm/drm_atomic.c        | 7 -------
>  drivers/gpu/drm/drm_crtc_internal.h | 1 -
>  drivers/gpu/drm/drm_debugfs.c       | 9 ---------
>  3 files changed, 17 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
> index 723392f..861e130 100644
> --- a/drivers/gpu/drm/drm_atomic.c
> +++ b/drivers/gpu/drm/drm_atomic.c
> @@ -1731,13 +1731,6 @@ int drm_atomic_debugfs_init(struct drm_minor *minor)
>  			ARRAY_SIZE(drm_atomic_debugfs_list),
>  			minor->debugfs_root, minor);
>  }
> -
> -int drm_atomic_debugfs_cleanup(struct drm_minor *minor)
> -{
> -	return drm_debugfs_remove_files(drm_atomic_debugfs_list,
> -					ARRAY_SIZE(drm_atomic_debugfs_list),
> -					minor);
> -}
>  #endif
>  
>  /*
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index 724c329..1bdcfd5 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -177,7 +177,6 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
>  #ifdef CONFIG_DEBUG_FS
>  struct drm_minor;
>  int drm_atomic_debugfs_init(struct drm_minor *minor);
> -int drm_atomic_debugfs_cleanup(struct drm_minor *minor);
>  #endif
>  
>  int drm_atomic_get_property(struct drm_mode_object *obj,
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index 04b0af3..2290a74 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -243,7 +243,6 @@ static void drm_debugfs_remove_all_files(struct drm_minor *minor)
>  int drm_debugfs_cleanup(struct drm_minor *minor)
>  {
>  	struct drm_device *dev = minor->dev;
> -	int ret;
>  
>  	if (!minor->debugfs_root)
>  		return 0;
> @@ -251,14 +250,6 @@ int drm_debugfs_cleanup(struct drm_minor *minor)
>  	if (dev->driver->debugfs_cleanup)
>  		dev->driver->debugfs_cleanup(minor);
>  
> -	if (drm_core_check_feature(dev, DRIVER_ATOMIC)) {
> -		ret = drm_atomic_debugfs_cleanup(minor);
> -		if (ret) {
> -			DRM_ERROR("DRM: Failed to remove atomic debugfs entries\n");
> -			return ret;
> -		}
> -	}
> -
>  	drm_debugfs_remove_all_files(minor);
>  
>  	debugfs_remove_recursive(minor->debugfs_root);
> -- 
> 2.10.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch