drm/amdgpu: Fix build warning for TA debugfs interface
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: Fix build warning for TA debugfs interface
Remove the redundant codes to fix build warning
when CONFIG_DEBUG_FS is disabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 43 ++++++---------------- 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +12 -31
@@ -24,13 +24,6 @@#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; -static ssize_t ta_if_load_debugfs_write (struct file *fp,const char *buf,size_t len,loff_t *off); static ssize_t ta_if_unload_debugfs_write(struct file *fp, const char *buf,
@@ -38,7 +31,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 +66,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 +278,20 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, sizereturn ret; } -static struct dentry *amdgpu_ta_if_debugfs_create (struct amdgpu_device *adev) +void amdgpu_ta_if_debugfs_init (struct amdgpu_device *adev) { +#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor =adev_to_drm (adev)->primary; - dir =debugfs_create_dir (TA_IF_FS_NAME , minor->debugfs_root); - - ta_load_debugfs_dentry =debugfs_create_file ("ta_load" ,0200 , dir, adev, - &ta_load_debugfs_fops); +struct dentry *dir =debugfs_create_dir ("ta_if" , minor->debugfs_root); - ta_unload_debugfs_dentry =debugfs_create_file ("ta_unload" ,0200 , dir, - adev, &ta_unload_debugfs_fops); +debugfs_create_file ("ta_load" ,0200 , dir, adev, + &ta_load_debugfs_fops); - ta_invoke_debugfs_dentry =debugfs_create_file ("ta_invoke" ,0200 , dir, - adev, &ta_invoke_debugfs_fops); -return dir; -} +debugfs_create_file ("ta_unload" ,0200 , dir, + adev, &ta_unload_debugfs_fops); -void amdgpu_ta_if_debugfs_init (struct amdgpu_device *adev) -{ -#if defined(CONFIG_DEBUG_FS ) - dir =amdgpu_ta_if_debugfs_create (adev); +debugfs_create_file ("ta_invoke" ,0200 , dir, + adev, &ta_invoke_debugfs_fops);#endif } - -void amdgpu_ta_if_debugfs_remove (void ) -{ -debugfs_remove_recursive (dir); -}
Signature · 1 line
2.17.1
[Public]
________________________________
From: amd-gfx <[email protected]> on behalf of Candice Li <[email protected]>
Sent: Wednesday, April 27, 2022 7:22 PM
To: [email protected] <[email protected]>
Cc: Li, Candice <[email protected]>
Subject: [PATCH v2] drm/amdgpu: Fix build warning for TA debugfs interface
Remove the redundant codes to fix build warning
when CONFIG_DEBUG_FS is disabled.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 43 ++++++---------------- 1 file changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c +10 -22
@@ -24,13 +24,6 @@#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; -static ssize_t ta_if_load_debugfs_write (struct file *fp,const char *buf,size_t len,loff_t *off); static ssize_t ta_if_unload_debugfs_write(struct file *fp, const char *buf,
@@ -38,7 +31,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 +66,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 +278,20 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, sizereturn ret; } -static struct dentry *amdgpu_ta_if_debugfs_create (struct amdgpu_device *adev) +void amdgpu_ta_if_debugfs_init (struct amdgpu_device *adev) { +#if defined(CONFIG_DEBUG_FS )struct drm_minor *minor =adev_to_drm (adev)->primary; - dir =debugfs_create_dir (TA_IF_FS_NAME , minor->debugfs_root); - - ta_load_debugfs_dentry =debugfs_create_file ("ta_load" ,0200 , dir, adev, - &ta_load_debugfs_fops); +struct dentry *dir =debugfs_create_dir ("ta_if" , minor->debugfs_root); - ta_unload_debugfs_dentry =debugfs_create_file ("ta_unload" ,0200 , dir, - adev, &ta_unload_debugfs_fops); +debugfs_create_file ("ta_load" ,0200 , dir, adev, + &ta_load_debugfs_fops); - ta_invoke_debugfs_dentry =debugfs_create_file ("ta_invoke" ,0200 , dir, - adev, &ta_invoke_debugfs_fops); -return dir; -} +debugfs_create_file ("ta_unload" ,0200 , dir, + adev, &ta_unload_debugfs_fops);
[kevin]:
I think your patch is still have "defined but not used" warning,
because the ta_xxx_debugfs_fops are not used when the macro of CONFIG_DEBUG_FS is undefined.
It's better to add this macro check outside all functions.
Best Regards,
Kevin
-void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev) -{
-#if defined(CONFIG_DEBUG_FS)
- dir = amdgpu_ta_if_debugfs_create(adev);
+ debugfs_create_file("ta_invoke", 0200, dir,
+ adev, &ta_invoke_debugfs_fops);
#endif
}
-
-void amdgpu_ta_if_debugfs_remove(void)
-{
- debugfs_remove_recursive(dir);
-}
--
2.17.1