Commit 9e2fd463 authored by Wambui Karuga's avatar Wambui Karuga Committed by Daniel Vetter
Browse files

drm/msm: remove checks for return value of drm_debugfs_create_files() 

Since commit 987d65d0 (drm: debugfs: make
drm_debugfs_create_files() never fail), drm_debugfs_create_files never
fails and only returns 0. Therefore, the unnecessary checks for its
return value and error handling in various debugfs_init() functions in
drm/msm and have the functions return 0 directly.

v2: have debug functions return 0 instead of void to avoid build
breakage and ensure standalone compilation.

References: https://lists.freedesktop.org/archives/dri-devel/2020-February/257183.html


Signed-off-by: default avatarWambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20200310133121.27913-9-wambui.karugax@gmail.com
parent 14b46195

drivers/gpu/drm/msm/adreno/a5xx_debugfs.c

+3 −9
Original line number Diff line number Diff line
@@ -151,22 +151,16 @@ DEFINE_SIMPLE_ATTRIBUTE(reset_fops, NULL, reset_set, "%llx\n"); 
int a5xx_debugfs_init(struct msm_gpu *gpu, struct drm_minor *minor)

{

	struct drm_device *dev;

	int ret;



	if (!minor)

		return 0;



	dev = minor->dev;



	ret = drm_debugfs_create_files(a5xx_debugfs_list,

	drm_debugfs_create_files(a5xx_debugfs_list,

				 ARRAY_SIZE(a5xx_debugfs_list),

				 minor->debugfs_root, minor);



	if (ret) {

		DRM_DEV_ERROR(dev->dev, "could not install a5xx_debugfs_list\n");

		return ret;

	}



	debugfs_create_file("reset", S_IWUGO, minor->debugfs_root, dev,

			    &reset_fops);

drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c

+3 −11
Original line number Diff line number Diff line
@@ -259,18 +259,10 @@ static struct drm_info_list mdp5_debugfs_list[] = { 


static int mdp5_kms_debugfs_init(struct msm_kms *kms, struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	int ret;



	ret = drm_debugfs_create_files(mdp5_debugfs_list,

	drm_debugfs_create_files(mdp5_debugfs_list,

				 ARRAY_SIZE(mdp5_debugfs_list),

				 minor->debugfs_root, minor);



	if (ret) {

		DRM_DEV_ERROR(dev->dev, "could not install mdp5_debugfs_list\n");

		return ret;

	}



	return 0;

}

#endif

drivers/gpu/drm/msm/msm_debugfs.c

+4 −9
Original line number Diff line number Diff line
@@ -220,15 +220,10 @@ int msm_debugfs_init(struct drm_minor *minor) 
	struct msm_drm_private *priv = dev->dev_private;

	int ret;



	ret = drm_debugfs_create_files(msm_debugfs_list,

	drm_debugfs_create_files(msm_debugfs_list,

				 ARRAY_SIZE(msm_debugfs_list),

				 minor->debugfs_root, minor);



	if (ret) {

		DRM_DEV_ERROR(dev->dev, "could not install msm_debugfs_list\n");

		return ret;

	}



	debugfs_create_file("gpu", S_IRUSR, minor->debugfs_root,

		dev, &msm_gpu_fops);
@@ -238,7 +233,7 @@ int msm_debugfs_init(struct drm_minor *minor) 
			return ret;

	}



	return ret;

	return 0;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE