[PATCH] drm/debugfs: Fix drm_debugfs_remove_files() stub

Christian König christian.koenig at amd.com
Thu Sep 14 05:53:13 UTC 2023


Am 14.09.23 um 01:30 schrieb Nathan Chancellor:
> When building without CONFIG_DEBUG_FS:
>
>    drivers/gpu/drm/tegra/dc.c:1757:59: error: too many arguments to function call, expected 3, have 4
>     1757 |         drm_debugfs_remove_files(dc->debugfs_files, count, root, minor);
>          |         ~~~~~~~~~~~~~~~~~~~~~~~~                                 ^~~~~
>    include/drm/drm_debugfs.h:162:19: note: 'drm_debugfs_remove_files' declared here
>      162 | static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
>          |                   ^                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>      163 |                                            int count, struct drm_minor *minor)
>          |                                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>    1 error generated.
>
> Update the stub to include the root parameter.
>
> Fixes: 8e455145d8f1 ("drm/debugfs: rework drm_debugfs_create_files implementation v2")
> Signed-off-by: Nathan Chancellor <nathan at kernel.org>

Reviewed and pushed to drm-misc-next.

Sorry for the noise, I didn't tested the latest version of the patch 
without CONFIG_DEBUG_FS.

Regards,
Christian.

> ---
>   include/drm/drm_debugfs.h | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/drm/drm_debugfs.h b/include/drm/drm_debugfs.h
> index 7213ce15e4ff..3bba169f9bae 100644
> --- a/include/drm/drm_debugfs.h
> +++ b/include/drm/drm_debugfs.h
> @@ -160,7 +160,8 @@ static inline void drm_debugfs_create_files(const struct drm_info_list *files,
>   {}
>   
>   static inline int drm_debugfs_remove_files(const struct drm_info_list *files,
> -					   int count, struct drm_minor *minor)
> +					   int count, struct dentry *root,
> +					   struct drm_minor *minor)
>   {
>   	return 0;
>   }
>
> ---
> base-commit: fc71f615fd08a530d24c7af0a1efa72ec6ea8e34
> change-id: 20230913-fix-drm_debugfs_remove_files-stub-bd864127c162
>
> Best regards,



More information about the dri-devel mailing list