drm/tegra: remove checks for debugfs functions return value
Subsystems (5)
PATCH 1/1 drm/tegra: remove checks for debugfs functions return value
Remove the return checks and error handling of the drm_debugfs_create_files function from various debugfs init functions in drm/tegra and have them return 0 directly.
--- drivers/gpu/drm/tegra/dc.c | 11 +---------- drivers/gpu/drm/tegra/drm.c | 7 ++++--- drivers/gpu/drm/tegra/dsi.c | 11 +---------- drivers/gpu/drm/tegra/hdmi.c | 11 +---------- drivers/gpu/drm/tegra/sor.c | 11 +---------- 5 files changed, 8 insertions(+), 43 deletions(-)
drivers/gpu/drm/tegra/dc.c +1 -10
@@ -1496,7 +1496,6 @@ static int tegra_dc_late_register(struct drm_crtc *crtc)struct drm_minor *minor = crtc->dev->primary;struct dentry *root;struct tegra_dc *dc =to_tegra_dc (crtc); -int err;#ifdef CONFIG_DEBUG_FS root = crtc->debugfs_entry;
@@ -1512,17 +1511,9 @@ static int tegra_dc_late_register(struct drm_crtc *crtc)for (i =0 ; i < count; i++) dc->debugfs_files[i].data = dc; - err =drm_debugfs_create_files (dc->debugfs_files, count, root, minor); -if (err <0 ) - goto free; +drm_debugfs_create_files (dc->debugfs_files, count, root, minor);return 0 ; - -free: -kfree (dc->debugfs_files); - dc->debugfs_files =NULL ; - -return err; }static void tegra_dc_early_unregister (struct drm_crtc *crtc)
drivers/gpu/drm/tegra/drm.c +4 -3
@@ -841,9 +841,10 @@ static struct drm_info_list tegra_debugfs_list[] = {static int tegra_debugfs_init (struct drm_minor *minor) { -return drm_debugfs_create_files (tegra_debugfs_list, -ARRAY_SIZE (tegra_debugfs_list), - minor->debugfs_root, minor); +drm_debugfs_create_files (tegra_debugfs_list, +ARRAY_SIZE (tegra_debugfs_list), + minor->debugfs_root, minor); +return 0 ; }#endif
drivers/gpu/drm/tegra/dsi.c +1 -10
@@ -234,7 +234,6 @@ static int tegra_dsi_late_register(struct drm_connector *connector)struct drm_minor *minor = connector->dev->primary;struct dentry *root = connector->debugfs_entry;struct tegra_dsi *dsi =to_dsi (output); -int err; dsi->debugfs_files =kmemdup (debugfs_files,sizeof (debugfs_files),GFP_KERNEL );
@@ -244,17 +243,9 @@ static int tegra_dsi_late_register(struct drm_connector *connector)for (i =0 ; i < count; i++) dsi->debugfs_files[i].data = dsi; - err =drm_debugfs_create_files (dsi->debugfs_files, count, root, minor); -if (err <0 ) - goto free; +drm_debugfs_create_files (dsi->debugfs_files, count, root, minor);return 0 ; - -free: -kfree (dsi->debugfs_files); - dsi->debugfs_files =NULL ; - -return err; }static void tegra_dsi_early_unregister (struct drm_connector *connector)
drivers/gpu/drm/tegra/hdmi.c +1 -10
@@ -1064,7 +1064,6 @@ static int tegra_hdmi_late_register(struct drm_connector *connector)struct drm_minor *minor = connector->dev->primary;struct dentry *root = connector->debugfs_entry;struct tegra_hdmi *hdmi =to_hdmi (output); -int err; hdmi->debugfs_files =kmemdup (debugfs_files,sizeof (debugfs_files),GFP_KERNEL );
@@ -1074,17 +1073,9 @@ static int tegra_hdmi_late_register(struct drm_connector *connector)for (i =0 ; i < count; i++) hdmi->debugfs_files[i].data = hdmi; - err =drm_debugfs_create_files (hdmi->debugfs_files, count, root, minor); -if (err <0 ) - goto free; +drm_debugfs_create_files (hdmi->debugfs_files, count, root, minor);return 0 ; - -free: -kfree (hdmi->debugfs_files); - hdmi->debugfs_files =NULL ; - -return err; }static void tegra_hdmi_early_unregister (struct drm_connector *connector)
drivers/gpu/drm/tegra/sor.c +1 -10
@@ -1687,7 +1687,6 @@ static int tegra_sor_late_register(struct drm_connector *connector)struct drm_minor *minor = connector->dev->primary;struct dentry *root = connector->debugfs_entry;struct tegra_sor *sor =to_sor (output); -int err; sor->debugfs_files =kmemdup (debugfs_files,sizeof (debugfs_files),GFP_KERNEL );
@@ -1697,17 +1696,9 @@ static int tegra_sor_late_register(struct drm_connector *connector)for (i =0 ; i < count; i++) sor->debugfs_files[i].data = sor; - err =drm_debugfs_create_files (sor->debugfs_files, count, root, minor); -if (err <0 ) - goto free; +drm_debugfs_create_files (sor->debugfs_files, count, root, minor);return 0 ; - -free: -kfree (sor->debugfs_files); - sor->debugfs_files =NULL ; - -return err; }static void tegra_sor_early_unregister (struct drm_connector *connector)
Signature · 1 line
2.17.1
PATCH 1/1 drm/tilcdc: remove check for return value of debugfs functions.
Remove the check and error handling of the return value of drm_debugfs_create_files as it is not needed in tilcdc_debugfs_init. Also remove local variables that are not used after the changes.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +4 -11
@@ -480,24 +480,17 @@ static struct drm_info_list tilcdc_debugfs_list[] = {static int tilcdc_debugfs_init (struct drm_minor *minor) { -struct drm_device *dev = minor->dev;struct tilcdc_module *mod; -int ret; - ret =drm_debugfs_create_files (tilcdc_debugfs_list, -ARRAY_SIZE (tilcdc_debugfs_list), - minor->debugfs_root, minor); +drm_debugfs_create_files (tilcdc_debugfs_list, +ARRAY_SIZE (tilcdc_debugfs_list), + minor->debugfs_root, minor);list_for_each_entry (mod, &module_list, list)if (mod->funcs->debugfs_init) mod->funcs->debugfs_init (mod, minor); -if (ret) { -dev_err (dev->dev,"could not install tilcdc_debugfs_list\n" ); -return ret; - } - -return ret; +return 0 ; }#endif
Signature · 1 line
2.17.1
Re: [PATCH] drm/tilcdc: remove check for return value of debugfs functions.
Quoted 5 lines · Wambui Karuga
Remove the check and error handling of the return value of
drm_debugfs_create_filesas it is not needed intilcdc_debugfs_init. Also remove local variables that are not used after the changes.Signed-off-by Wambui Karuga <[email protected]>
I'll merge this to drm-misc-next tomorrow.
Thank you for the patch,
Jyri
Quoted 38 lines
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)drivers/gpu/drm/tilcdc/tilcdc_drv.c +4
-11@@ -480,24 +480,17 @@ static struct drm_info_list tilcdc_debugfs_list[] = {static int tilcdc_debugfs_init (struct drm_minor *minor) { -struct drm_device *dev = minor->dev;struct tilcdc_module *mod; -int ret; - ret =drm_debugfs_create_files (tilcdc_debugfs_list, -ARRAY_SIZE (tilcdc_debugfs_list), - minor->debugfs_root, minor); +drm_debugfs_create_files (tilcdc_debugfs_list, +ARRAY_SIZE (tilcdc_debugfs_list), + minor->debugfs_root, minor);list_for_each_entry (mod, &module_list, list)if (mod->funcs->debugfs_init) mod->funcs->debugfs_init (mod, minor); -if (ret) { -dev_err (dev->dev,"could not install tilcdc_debugfs_list\n" ); -return ret; - } - -return ret; +return 0 ; }#endif
Signature · 6 lines
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel