[PATCH 2/3] drm/debugfs: Remove the drm_driver.debugfs_cleanup callback

Daniel Vetter daniel at ffwll.ch
Wed Mar 8 10:29:41 UTC 2017


On Tue, Mar 07, 2017 at 09:49:23PM +0100, Noralf Trønnes wrote:
> Remove the .debugfs_cleanup() callback now that all the users are gone.
> 
> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>

First 2 patches merged to drm-misc, with Rob's irc ack on the first one.
I'll leave the 3rd for Gerd.

Thanks, Daniel

> ---
>  drivers/gpu/drm/drm_debugfs.c | 5 -----
>  include/drm/drm_drv.h         | 1 -
>  2 files changed, 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index 8b2c61a..1d2d18d 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -242,14 +242,9 @@ 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;
> -
>  	if (!minor->debugfs_root)
>  		return 0;
>  
> -	if (dev->driver->debugfs_cleanup)
> -		dev->driver->debugfs_cleanup(minor);
> -
>  	drm_debugfs_remove_all_files(minor);
>  
>  	debugfs_remove_recursive(minor->debugfs_root);
> diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
> index 661ca24..8ed1ef5 100644
> --- a/include/drm/drm_drv.h
> +++ b/include/drm/drm_drv.h
> @@ -302,7 +302,6 @@ struct drm_driver {
>  	void (*master_drop)(struct drm_device *dev, struct drm_file *file_priv);
>  
>  	int (*debugfs_init)(struct drm_minor *minor);
> -	void (*debugfs_cleanup)(struct drm_minor *minor);
>  
>  	/**
>  	 * @gem_free_object: deconstructor for drm_gem_objects
> -- 
> 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


More information about the dri-devel mailing list