All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Christian König" <christian.koenig@amd.com>
To: Nathan Chancellor <nathan@kernel.org>,
	maarten.lankhorst@linux.intel.com, mripard@kernel.org,
	tzimmermann@suse.de
Cc: andi.shyti@linux.intel.com, dri-devel@lists.freedesktop.org,
	patches@lists.linux.dev
Subject: Re: [PATCH] drm/debugfs: Fix drm_debugfs_remove_files() stub
Date: Thu, 14 Sep 2023 07:53:13 +0200	[thread overview]
Message-ID: <e66fcb4f-d0bb-ff80-3dfd-6d497cd02a08@amd.com> (raw)
In-Reply-To: <20230913-fix-drm_debugfs_remove_files-stub-v1-1-6b952ac559f3@kernel.org>

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@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,


WARNING: multiple messages have this Message-ID (diff)
From: "Christian König" <christian.koenig@amd.com>
To: Nathan Chancellor <nathan@kernel.org>,
	maarten.lankhorst@linux.intel.com,  mripard@kernel.org,
	tzimmermann@suse.de
Cc: dri-devel@lists.freedesktop.org, andi.shyti@linux.intel.com,
	patches@lists.linux.dev
Subject: Re: [PATCH] drm/debugfs: Fix drm_debugfs_remove_files() stub
Date: Thu, 14 Sep 2023 07:53:13 +0200	[thread overview]
Message-ID: <e66fcb4f-d0bb-ff80-3dfd-6d497cd02a08@amd.com> (raw)
In-Reply-To: <20230913-fix-drm_debugfs_remove_files-stub-v1-1-6b952ac559f3@kernel.org>

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@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,


  reply	other threads:[~2023-09-14  5:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-13 23:30 [PATCH] drm/debugfs: Fix drm_debugfs_remove_files() stub Nathan Chancellor
2023-09-13 23:30 ` Nathan Chancellor
2023-09-14  5:53 ` Christian König [this message]
2023-09-14  5:53   ` Christian König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e66fcb4f-d0bb-ff80-3dfd-6d497cd02a08@amd.com \
    --to=christian.koenig@amd.com \
    --cc=andi.shyti@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=nathan@kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.