提交 86e18ac3 编写于 作者: C Candice Li 提交者: Alex Deucher

drm/amdgpu: Fix build warning for TA debugfs interface

Remove the redundant codes to fix build warning
when CONFIG_DEBUG_FS is disabled.
Reported-by: NRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: NCandice Li <candice.li@amd.com>
Reviewed-by: NYang Wang <kevinyang.wang@amd.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>
上级 71199aa4
...@@ -24,12 +24,7 @@ ...@@ -24,12 +24,7 @@
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_psp_ta.h" #include "amdgpu_psp_ta.h"
static const char *TA_IF_FS_NAME = "ta_if"; #if defined(CONFIG_DEBUG_FS)
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, static ssize_t ta_if_load_debugfs_write(struct file *fp, const char *buf,
size_t len, loff_t *off); size_t len, loff_t *off);
...@@ -38,7 +33,6 @@ static ssize_t ta_if_unload_debugfs_write(struct file *fp, const char *buf, ...@@ -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, static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf,
size_t len, loff_t *off); size_t len, loff_t *off);
static uint32_t get_bin_version(const uint8_t *bin) static uint32_t get_bin_version(const uint8_t *bin)
{ {
const struct common_firmware_header *hdr = const struct common_firmware_header *hdr =
...@@ -74,19 +68,19 @@ static bool is_ta_type_valid(enum ta_type_id ta_type) ...@@ -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 = { static const struct file_operations ta_load_debugfs_fops = {
.write = ta_if_load_debugfs_write, .write = ta_if_load_debugfs_write,
.llseek = default_llseek, .llseek = default_llseek,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
static const struct file_operations ta_unload_debugfs_fops = { static const struct file_operations ta_unload_debugfs_fops = {
.write = ta_if_unload_debugfs_write, .write = ta_if_unload_debugfs_write,
.llseek = default_llseek, .llseek = default_llseek,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
static const struct file_operations ta_invoke_debugfs_fops = { static const struct file_operations ta_invoke_debugfs_fops = {
.write = ta_if_invoke_debugfs_write, .write = ta_if_invoke_debugfs_write,
.llseek = default_llseek, .llseek = default_llseek,
.owner = THIS_MODULE .owner = THIS_MODULE
}; };
...@@ -286,31 +280,25 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size ...@@ -286,31 +280,25 @@ static ssize_t ta_if_invoke_debugfs_write(struct file *fp, const char *buf, size
return ret; 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; 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, debugfs_create_file("ta_load", 0200, dir, adev,
&ta_load_debugfs_fops); &ta_load_debugfs_fops);
ta_unload_debugfs_dentry = debugfs_create_file("ta_unload", 0200, dir, debugfs_create_file("ta_unload", 0200, dir,
adev, &ta_unload_debugfs_fops); adev, &ta_unload_debugfs_fops);
ta_invoke_debugfs_dentry = debugfs_create_file("ta_invoke", 0200, dir, debugfs_create_file("ta_invoke", 0200, dir,
adev, &ta_invoke_debugfs_fops); adev, &ta_invoke_debugfs_fops);
return dir;
} }
#else
void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev) 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
...@@ -25,6 +25,5 @@ ...@@ -25,6 +25,5 @@
#define __AMDGPU_PSP_TA_H__ #define __AMDGPU_PSP_TA_H__
void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev); void amdgpu_ta_if_debugfs_init(struct amdgpu_device *adev);
void amdgpu_ta_if_debugfs_remove(void);
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册