<html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style> </head> <body dir="ltr"> [AMD Official Use Only - General] <div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof"> Reviewed-by: Yang Wang <kevinyang.wang@amd.com></div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof"> </div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof"> Best Regards,</div> <div style="font-family: Calibri, Arial, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);" class="elementToProof"> Kevin</div> <hr tabindex="-1" style="display:inline-block; width:98%"> <div id="divRplyFwdMsg" dir="ltr">From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> on behalf of Candice Li <candice.li@amd.com> Sent: Thursday, April 28, 2022 4:25 PM To: amd-gfx@lists.freedesktop.org <amd-gfx@lists.freedesktop.org> Cc: Li, Candice <Candice.Li@amd.com> Subject: [PATCH v3] drm/amdgpu: Fix build warning for TA debugfs interface <div> </div> </div> <div class="BodyFragment"> <div class="PlainText">Remove the redundant codes to fix build warning when CONFIG_DEBUG_FS is disabled. Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Candice Li <candice.li@amd.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 40 ++++++++-------------- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h | 1 - 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c index 6806deb098d3f7..0988e00612e515 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c @@ -24,12 +24,7 @@ #include "amdgpu.h" #include "amdgpu_psp_ta.h" -static const char *TA_IF_FS_NAME = "ta_if"; - -struct dentry *dir; -static struct dentry *ta_load_debugfs_dentry; -static struct dentry *ta_unload_debugfs_dentry; -static struct dentry *ta_invoke_debugfs_dentry; +#if defined(CONFIG_DEBUG_FS) static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf, size_t len, loff_t *off); @@ -38,7 +33,6 @@ static ssize_t ta_if_unload_debugfs_write(struct file *fp, const char *buf, static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size_t len, loff_t *off); - static uint32_t get_bin_version(const uint8_t *bin) { const struct common_firmware_header *hdr = @@ -74,19 +68,19 @@ static bool is_ta_type_valid(enum ta_type_id ta_type) } static const struct file_operations ta_load_debugfs_fops = { - .write = ta_if_load_debugfs_write, + .write = ta_if_load_debugfs_write, .llseek = default_llseek, .owner = THIS_MODULE }; static const struct file_operations ta_unload_debugfs_fops = { - .write = ta_if_unload_debugfs_write, + .write = ta_if_unload_debugfs_write, .llseek = default_llseek, .owner = THIS_MODULE }; static const struct file_operations ta_invoke_debugfs_fops = { - .write = ta_if_invoke_debugfs_write, + .write = ta_if_invoke_debugfs_write, .llseek = default_llseek, .owner = THIS_MODULE }; @@ -286,31 +280,25 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size return ret; } -static struct dentry *amdgpu_ta_if_debugfs_create(struct amdgpu_device *adev) +void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev) { struct drm_minor *minor = adev_to_drm(adev)->primary; - dir = debugfs_create_dir(TA_IF_FS_NAME, minor->debugfs_root); + struct dentry *dir = debugfs_create_dir("ta_if", minor->debugfs_root); - ta_load_debugfs_dentry = debugfs_create_file("ta_load", 0200, dir, adev, - &ta_load_debugfs_fops); + debugfs_create_file("ta_load", 0200, dir, adev, + &ta_load_debugfs_fops); - ta_unload_debugfs_dentry = debugfs_create_file("ta_unload", 0200, dir, - adev, &ta_unload_debugfs_fops); + debugfs_create_file("ta_unload", 0200, dir, + adev, &ta_unload_debugfs_fops); - ta_invoke_debugfs_dentry = debugfs_create_file("ta_invoke", 0200, dir, - adev, &ta_invoke_debugfs_fops); - return dir; + debugfs_create_file("ta_invoke", 0200, dir, + adev, &ta_invoke_debugfs_fops); } +#else void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev) { -#if defined(CONFIG_DEBUG_FS) - dir = amdgpu_ta_if_debugfs_create(adev); -#endif -} -void amdgpu_ta_if_debugfs_remove(void) -{ - debugfs_remove_recursive(dir); } +#endif diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h index 883f89d57616d0..cfc1542f63ef94 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.h @@ -25,6 +25,5 @@ #define __AMDGPU_PSP_TA_H__ void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev); -void amdgpu_ta_if_debugfs_remove(void); #endif -- 2.17.1 </div> </div> </div> </body> </html>