Commit 450f30ea authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alex Deucher

amdgpu: no need to check return value of debugfs_create functions

When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: "Christian König" <christian.koenig@amd.com>
Cc: "David (ChunMing) Zhou" <David1.Zhou@amd.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: xinhui pan <xinhui.pan@amd.com>
Cc: Evan Quan <evan.quan@amd.com>
Cc: Feifei Xu <Feifei.Xu@amd.com>
Cc: amd-gfx@lists.freedesktop.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bb1d26b4
...@@ -967,40 +967,24 @@ static int amdgpu_ras_sysfs_remove_all(struct amdgpu_device *adev) ...@@ -967,40 +967,24 @@ static int amdgpu_ras_sysfs_remove_all(struct amdgpu_device *adev)
/* sysfs end */ /* sysfs end */
/* debugfs begin */ /* debugfs begin */
static int amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev) static void amdgpu_ras_debugfs_create_ctrl_node(struct amdgpu_device *adev)
{ {
struct amdgpu_ras *con = amdgpu_ras_get_context(adev); struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
struct drm_minor *minor = adev->ddev->primary; struct drm_minor *minor = adev->ddev->primary;
struct dentry *root = minor->debugfs_root, *dir;
struct dentry *ent;
dir = debugfs_create_dir("ras", root);
if (IS_ERR(dir))
return -EINVAL;
con->dir = dir; con->dir = debugfs_create_dir("ras", minor->debugfs_root);
con->ent = debugfs_create_file("ras_ctrl", S_IWUGO | S_IRUGO, con->dir,
ent = debugfs_create_file("ras_ctrl", adev, &amdgpu_ras_debugfs_ctrl_ops);
S_IWUGO | S_IRUGO, con->dir,
adev, &amdgpu_ras_debugfs_ctrl_ops);
if (IS_ERR(ent)) {
debugfs_remove(con->dir);
return -EINVAL;
}
con->ent = ent;
return 0;
} }
int amdgpu_ras_debugfs_create(struct amdgpu_device *adev, void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
struct ras_fs_if *head) struct ras_fs_if *head)
{ {
struct amdgpu_ras *con = amdgpu_ras_get_context(adev); struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
struct ras_manager *obj = amdgpu_ras_find_obj(adev, &head->head); struct ras_manager *obj = amdgpu_ras_find_obj(adev, &head->head);
struct dentry *ent;
if (!obj || obj->ent) if (!obj || obj->ent)
return -EINVAL; return;
get_obj(obj); get_obj(obj);
...@@ -1008,34 +992,25 @@ int amdgpu_ras_debugfs_create(struct amdgpu_device *adev, ...@@ -1008,34 +992,25 @@ int amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
head->debugfs_name, head->debugfs_name,
sizeof(obj->fs_data.debugfs_name)); sizeof(obj->fs_data.debugfs_name));
ent = debugfs_create_file(obj->fs_data.debugfs_name, obj->ent = debugfs_create_file(obj->fs_data.debugfs_name,
S_IWUGO | S_IRUGO, con->dir, S_IWUGO | S_IRUGO, con->dir, obj,
obj, &amdgpu_ras_debugfs_ops); &amdgpu_ras_debugfs_ops);
if (IS_ERR(ent))
return -EINVAL;
obj->ent = ent;
return 0;
} }
int amdgpu_ras_debugfs_remove(struct amdgpu_device *adev, void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,
struct ras_common_if *head) struct ras_common_if *head)
{ {
struct ras_manager *obj = amdgpu_ras_find_obj(adev, head); struct ras_manager *obj = amdgpu_ras_find_obj(adev, head);
if (!obj || !obj->ent) if (!obj || !obj->ent)
return 0; return;
debugfs_remove(obj->ent); debugfs_remove(obj->ent);
obj->ent = NULL; obj->ent = NULL;
put_obj(obj); put_obj(obj);
return 0;
} }
static int amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev) static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)
{ {
struct amdgpu_ras *con = amdgpu_ras_get_context(adev); struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
struct ras_manager *obj, *tmp; struct ras_manager *obj, *tmp;
...@@ -1048,8 +1023,6 @@ static int amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev) ...@@ -1048,8 +1023,6 @@ static int amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev)
debugfs_remove(con->dir); debugfs_remove(con->dir);
con->dir = NULL; con->dir = NULL;
con->ent = NULL; con->ent = NULL;
return 0;
} }
/* debugfs end */ /* debugfs end */
......
...@@ -276,10 +276,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev, ...@@ -276,10 +276,10 @@ int amdgpu_ras_sysfs_create(struct amdgpu_device *adev,
int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev, int amdgpu_ras_sysfs_remove(struct amdgpu_device *adev,
struct ras_common_if *head); struct ras_common_if *head);
int amdgpu_ras_debugfs_create(struct amdgpu_device *adev, void amdgpu_ras_debugfs_create(struct amdgpu_device *adev,
struct ras_fs_if *head); struct ras_fs_if *head);
int amdgpu_ras_debugfs_remove(struct amdgpu_device *adev, void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev,
struct ras_common_if *head); struct ras_common_if *head);
int amdgpu_ras_error_query(struct amdgpu_device *adev, int amdgpu_ras_error_query(struct amdgpu_device *adev,
......
...@@ -3904,9 +3904,7 @@ static int gfx_v9_0_ecc_late_init(void *handle) ...@@ -3904,9 +3904,7 @@ static int gfx_v9_0_ecc_late_init(void *handle)
if (r) if (r)
goto interrupt; goto interrupt;
r = amdgpu_ras_debugfs_create(adev, &fs_info); amdgpu_ras_debugfs_create(adev, &fs_info);
if (r)
goto debugfs;
r = amdgpu_ras_sysfs_create(adev, &fs_info); r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r) if (r)
...@@ -3921,7 +3919,6 @@ static int gfx_v9_0_ecc_late_init(void *handle) ...@@ -3921,7 +3919,6 @@ static int gfx_v9_0_ecc_late_init(void *handle)
amdgpu_ras_sysfs_remove(adev, *ras_if); amdgpu_ras_sysfs_remove(adev, *ras_if);
sysfs: sysfs:
amdgpu_ras_debugfs_remove(adev, *ras_if); amdgpu_ras_debugfs_remove(adev, *ras_if);
debugfs:
amdgpu_ras_interrupt_remove_handler(adev, &ih_info); amdgpu_ras_interrupt_remove_handler(adev, &ih_info);
interrupt: interrupt:
amdgpu_ras_feature_enable(adev, *ras_if, 0); amdgpu_ras_feature_enable(adev, *ras_if, 0);
......
...@@ -730,9 +730,7 @@ static int gmc_v9_0_ecc_late_init(void *handle) ...@@ -730,9 +730,7 @@ static int gmc_v9_0_ecc_late_init(void *handle)
if (r) if (r)
goto interrupt; goto interrupt;
r = amdgpu_ras_debugfs_create(adev, &fs_info); amdgpu_ras_debugfs_create(adev, &fs_info);
if (r)
goto debugfs;
r = amdgpu_ras_sysfs_create(adev, &fs_info); r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r) if (r)
...@@ -747,7 +745,6 @@ static int gmc_v9_0_ecc_late_init(void *handle) ...@@ -747,7 +745,6 @@ static int gmc_v9_0_ecc_late_init(void *handle)
amdgpu_ras_sysfs_remove(adev, *ras_if); amdgpu_ras_sysfs_remove(adev, *ras_if);
sysfs: sysfs:
amdgpu_ras_debugfs_remove(adev, *ras_if); amdgpu_ras_debugfs_remove(adev, *ras_if);
debugfs:
amdgpu_ras_interrupt_remove_handler(adev, &ih_info); amdgpu_ras_interrupt_remove_handler(adev, &ih_info);
interrupt: interrupt:
amdgpu_ras_feature_enable(adev, *ras_if, 0); amdgpu_ras_feature_enable(adev, *ras_if, 0);
......
...@@ -1566,9 +1566,7 @@ static int sdma_v4_0_late_init(void *handle) ...@@ -1566,9 +1566,7 @@ static int sdma_v4_0_late_init(void *handle)
if (r) if (r)
goto interrupt; goto interrupt;
r = amdgpu_ras_debugfs_create(adev, &fs_info); amdgpu_ras_debugfs_create(adev, &fs_info);
if (r)
goto debugfs;
r = amdgpu_ras_sysfs_create(adev, &fs_info); r = amdgpu_ras_sysfs_create(adev, &fs_info);
if (r) if (r)
...@@ -1589,7 +1587,6 @@ static int sdma_v4_0_late_init(void *handle) ...@@ -1589,7 +1587,6 @@ static int sdma_v4_0_late_init(void *handle)
amdgpu_ras_sysfs_remove(adev, *ras_if); amdgpu_ras_sysfs_remove(adev, *ras_if);
sysfs: sysfs:
amdgpu_ras_debugfs_remove(adev, *ras_if); amdgpu_ras_debugfs_remove(adev, *ras_if);
debugfs:
amdgpu_ras_interrupt_remove_handler(adev, &ih_info); amdgpu_ras_interrupt_remove_handler(adev, &ih_info);
interrupt: interrupt:
amdgpu_ras_feature_enable(adev, *ras_if, 0); amdgpu_ras_feature_enable(adev, *ras_if, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment