[PATCH 1/2] drm: debugfs: make drm_debugfs_remove_files() a void function

[Daniel Vetter]

On Fri, Jun 14, 2019 at 11:51:09AM +0200, Greg Kroah-Hartman wrote:
> The function can not fail, and no one checks the current return value,
> so just mark it as a void function so no one gets confused.
> 
> Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Cc: Maxime Ripard <maxime.ripard at bootlin.com>
> Cc: Sean Paul <sean at poorly.run>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>
> Cc: dri-devel at lists.freedesktop.org
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> ---
>  drivers/gpu/drm/drm_debugfs.c | 5 ++---
>  include/drm/drm_debugfs.h     | 9 ++++-----
>  2 files changed, 6 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
> index 6f2802e9bfb5..515569002c86 100644
> --- a/drivers/gpu/drm/drm_debugfs.c
> +++ b/drivers/gpu/drm/drm_debugfs.c
> @@ -270,8 +270,8 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id,
>  }
>  
>  
> -int drm_debugfs_remove_files(const struct drm_info_list *files, int count,
> -			     struct drm_minor *minor)
> +void drm_debugfs_remove_files(const struct drm_info_list *files, int count,
> +			      struct drm_minor *minor)

We're trying to entirely nuke this function here, see the kerneldoc for
drm_debugfs_create_files(). Only user left is tegra, and we call the
"remove all debugfs files" and the ->early_unregister hooks all from the
same place. So this can all be garbage collected. It's mildly annoying
because we'd need to move the kfree from ->early_unregister into ->destroy
callbacks, because connectors are unregister before we throw away all the
debugfs files in drm_dev_unregister(). But imo that's cleaner anway.

Up for that?

Cheers, Daniel
>  {
>  	struct list_head *pos, *q;
>  	struct drm_info_node *tmp;
> @@ -289,7 +289,6 @@ int drm_debugfs_remove_files(const struct drm_info_list *files, int count,
>  		}
>  	}
>  	mutex_unlock(&minor->debugfs_lock);
> -	return 0;
>  }
>  EXPORT_SYMBOL(drm_debugfs_remove_files);
>  
> diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h
> index ac0f75df1ac9..422d0d201c0a 100644
> --- a/include/drm/drm_debugfs.h
> +++ b/include/drm/drm_debugfs.h
> @@ -81,8 +81,8 @@ struct drm_info_node {
>  int drm_debugfs_create_files(const struct drm_info_list *files,
>  			     int count, struct dentry *root,
>  			     struct drm_minor *minor);
> -int drm_debugfs_remove_files(const struct drm_info_list *files,
> -			     int count, struct drm_minor *minor);
> +void drm_debugfs_remove_files(const struct drm_info_list *files,
> +			      int count, struct drm_minor *minor);
>  #else
>  static inline int drm_debugfs_create_files(const struct drm_info_list *files,
>  					   int count, struct dentry *root,
> @@ -91,10 +91,9 @@ static inline int drm_debugfs_create_files(const struct drm_info_list *files,
>  	return 0;
>  }
>  
> -static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
> -					   int count, struct drm_minor *minor)
> +static inline void drm_debugfs_remove_files(const struct drm_info_list *files,
> +					    int count, struct drm_minor *minor)
>  {
> -	return 0;
>  }
>  #endif
>  
> -- 
> 2.22.0
> 

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