amdgpu_dm: no need to check return value of debugfs_create functions
Subsystems (3)
PATCH 1/1 amdgpu_dm: 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.
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 35 ++++++------------- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 +- 3 files changed, 12 insertions(+), 31 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -5
@@ -4825,11 +4825,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,drm_connector_register (&aconnector->base);#if defined(CONFIG_DEBUG_FS ) - res =connector_debugfs_init (aconnector); -if (res) { -DRM_ERROR ("Failed to create debugfs for connector" ); - goto out_free; - } +connector_debugfs_init (aconnector); aconnector->debugfs_dpcd_address =0 ; aconnector->debugfs_dpcd_size =0 ;#endif
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +10 -25
@@ -873,25 +873,19 @@ static const struct { {"aux_dpcd_data", &dp_dpcd_data_debugfs_fops} }; -int connector_debugfs_init (struct amdgpu_dm_connector *connector) +void connector_debugfs_init (struct amdgpu_dm_connector *connector) {int i; -struct dentry *ent, *dir = connector->base.debugfs_entry; +struct dentry *dir = connector->base.debugfs_entry;if (connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) {for (i =0 ; i <ARRAY_SIZE (dp_debugfs_entries); i++) { - ent =debugfs_create_file (dp_debugfs_entries[i].name, -0644 , - dir, - connector, - dp_debugfs_entries[i].fops); -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file (dp_debugfs_entries[i].name, +0644 , dir, connector, + dp_debugfs_entries[i].fops); } } - -return 0 ; }/*
@@ -1034,7 +1028,7 @@ int dtn_debugfs_init(struct amdgpu_device *adev) };struct drm_minor *minor = adev->ddev->primary; -struct dentry *ent, *root = minor->debugfs_root; +struct dentry *root = minor->debugfs_root;int ret; ret = amdgpu_debugfs_add_files(adev, amdgpu_dm_debugfs_list,
@@ -1042,20 +1036,11 @@ int dtn_debugfs_init(struct amdgpu_device *adev)if (ret)return ret; - ent =debugfs_create_file ( -"amdgpu_dm_dtn_log" , -0644 , - root, - adev, - &dtn_log_fops); - -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file ("amdgpu_dm_dtn_log" ,0644 , root, adev, + &dtn_log_fops); - ent =debugfs_create_file_unsafe ("amdgpu_dm_visual_confirm" ,0644 , root, - adev, &visual_confirm_fops); -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file_unsafe ("amdgpu_dm_visual_confirm" ,0644 , root, adev, + &visual_confirm_fops);return 0 ; }
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h +1 -1
@@ -29,7 +29,7 @@#include "amdgpu.h" #include "amdgpu_dm.h" -int connector_debugfs_init (struct amdgpu_dm_connector *connector); +void connector_debugfs_init (struct amdgpu_dm_connector *connector);int dtn_debugfs_init (struct amdgpu_device *adev);#endif
Signature · 6 lines
2.22.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Kazlauskas, Nicholas
Reviewed-by Nicholas KazlauskasQuoted 13 lines · Greg Kroah-Hartman
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 Harry Wentland <[email protected]>Cc Leo Li <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Nicholas Kazlauskas <[email protected]>Cc David Francis <[email protected]>
Quoted 8 lines
Cc Mario Kleiner <[email protected]>Cc Bhawanpreet Lakha <[email protected]>Cc Anthony Koo <[email protected]>Cc hersen wu <[email protected]>Cc "Leo (Hanghong) Ma" <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
I'll keep this in mind when we're adding more of these entries - the functions do seem to check internally, so this makes the code a little simpler.
Thanks!
Nicholas Kazlauskas
Quoted 98 lines
--- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 35 ++++++------------- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 2 +- 3 files changed, 12 insertions(+), 31 deletions(-)drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1
-5@@ -4825,11 +4825,7 @@ static int amdgpu_dm_connector_init(struct amdgpu_display_manager *dm,drm_connector_register (&aconnector->base);#if defined(CONFIG_DEBUG_FS ) - res =connector_debugfs_init (aconnector); -if (res) { -DRM_ERROR ("Failed to create debugfs for connector" ); - goto out_free; - } +connector_debugfs_init (aconnector); aconnector->debugfs_dpcd_address =0 ; aconnector->debugfs_dpcd_size =0 ;#endif drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +10
-25@@ -873,25 +873,19 @@ static const struct { {"aux_dpcd_data", &dp_dpcd_data_debugfs_fops} }; -int connector_debugfs_init (struct amdgpu_dm_connector *connector) +void connector_debugfs_init (struct amdgpu_dm_connector *connector) {int i; -struct dentry *ent, *dir = connector->base.debugfs_entry; +struct dentry *dir = connector->base.debugfs_entry;if (connector->base.connector_type == DRM_MODE_CONNECTOR_DisplayPort || connector->base.connector_type == DRM_MODE_CONNECTOR_eDP) {for (i =0 ; i <ARRAY_SIZE (dp_debugfs_entries); i++) { - ent =debugfs_create_file (dp_debugfs_entries[i].name, -0644 , - dir, - connector, - dp_debugfs_entries[i].fops); -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file (dp_debugfs_entries[i].name, +0644 , dir, connector, + dp_debugfs_entries[i].fops); } } - -return 0 ; }/* @@ -1034,7 +1028,7 @@ int dtn_debugfs_init(struct amdgpu_device *adev) };struct drm_minor *minor = adev->ddev->primary; -struct dentry *ent, *root = minor->debugfs_root; +struct dentry *root = minor->debugfs_root;int ret; ret = amdgpu_debugfs_add_files(adev, amdgpu_dm_debugfs_list,@@ -1042,20 +1036,11 @@ int dtn_debugfs_init(struct amdgpu_device *adev)if (ret)return ret; - ent =debugfs_create_file ( -"amdgpu_dm_dtn_log" , -0644 , - root, - adev, - &dtn_log_fops); - -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file ("amdgpu_dm_dtn_log" ,0644 , root, adev, + &dtn_log_fops); - ent =debugfs_create_file_unsafe ("amdgpu_dm_visual_confirm" ,0644 , root, - adev, &visual_confirm_fops); -if (IS_ERR (ent)) -return PTR_ERR (ent); +debugfs_create_file_unsafe ("amdgpu_dm_visual_confirm" ,0644 , root, adev, + &visual_confirm_fops);return 0 ; }drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h +0
-0
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h line 35
Quoted 8 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h +1
-1@@ -29,7 +29,7 @@#include "amdgpu.h" #include "amdgpu_dm.h" -int connector_debugfs_init (struct amdgpu_dm_connector *connector); +void connector_debugfs_init (struct amdgpu_dm_connector *connector);int dtn_debugfs_init (struct amdgpu_device *adev);#endif
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx