Commit 54ac836b authored by Wambui Karuga's avatar Wambui Karuga Committed by Daniel Vetter
Browse files

drm/sti: remove use of drm_debugfs functions as return values 

Since commit 987d65d0 (drm: debugfs: make
drm_debugfs_create_files() never fail), drm_debugfs_create_files() never
fails, and should return void. This change therefore removes it uses as
a return value in various functions across drm/sti.

With these changes, the affected functions have been changed to use a void
return value.

v2: convert sti_mixer_debugfs_init() and sti_compositor_debugfs_init()
to return void too. Also have sti_drm_dbg_init() to return 0 to avoid
build issues.

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-10-wambui.karugax@gmail.com
parent 9e2fd463

drivers/gpu/drm/sti/sti_compositor.c

+2 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static const struct sti_compositor_data stih407_compositor_data = { 
	},

};



int sti_compositor_debugfs_init(struct sti_compositor *compo,

void sti_compositor_debugfs_init(struct sti_compositor *compo,

				 struct drm_minor *minor)

{

	unsigned int i;
@@ -54,8 +54,6 @@ int sti_compositor_debugfs_init(struct sti_compositor *compo, 
	for (i = 0; i < STI_MAX_MIXER; i++)

		if (compo->mixer[i])

			sti_mixer_debugfs_init(compo->mixer[i], minor);



	return 0;

}



static int sti_compositor_bind(struct device *dev,

drivers/gpu/drm/sti/sti_compositor.h

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ struct sti_compositor { 
	struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];

};



int sti_compositor_debugfs_init(struct sti_compositor *compo,

void sti_compositor_debugfs_init(struct sti_compositor *compo,

				 struct drm_minor *minor);



#endif

drivers/gpu/drm/sti/sti_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static int sti_crtc_late_register(struct drm_crtc *crtc) 
	struct sti_compositor *compo = dev_get_drvdata(mixer->dev);



	if (drm_crtc_index(crtc) == 0)

		return sti_compositor_debugfs_init(compo, crtc->dev->primary);

		sti_compositor_debugfs_init(compo, crtc->dev->primary);



	return 0;

}

drivers/gpu/drm/sti/sti_cursor.c

+8 −6
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct drm_info_list cursor_debugfs_files[] = { 
	{ "cursor", cursor_dbg_show, 0, NULL },

};



static int cursor_debugfs_init(struct sti_cursor *cursor,

static void cursor_debugfs_init(struct sti_cursor *cursor,

				struct drm_minor *minor)

{

	unsigned int i;
@@ -139,7 +139,7 @@ static int cursor_debugfs_init(struct sti_cursor *cursor, 
	for (i = 0; i < ARRAY_SIZE(cursor_debugfs_files); i++)

		cursor_debugfs_files[i].data = cursor;



	return drm_debugfs_create_files(cursor_debugfs_files,

	drm_debugfs_create_files(cursor_debugfs_files,

				 ARRAY_SIZE(cursor_debugfs_files),

				 minor->debugfs_root, minor);

}
@@ -342,7 +342,9 @@ static int sti_cursor_late_register(struct drm_plane *drm_plane) 
	struct sti_plane *plane = to_sti_plane(drm_plane);

	struct sti_cursor *cursor = to_sti_cursor(plane);



	return cursor_debugfs_init(cursor, drm_plane->dev->primary);

	cursor_debugfs_init(cursor, drm_plane->dev->primary);



	return 0;

}



static const struct drm_plane_funcs sti_cursor_plane_helpers_funcs = {

drivers/gpu/drm/sti/sti_drv.c

+3 −10
Original line number Diff line number Diff line
@@ -94,22 +94,15 @@ static struct drm_info_list sti_drm_dbg_list[] = { 


static int sti_drm_dbg_init(struct drm_minor *minor)

{

	int ret;



	ret = drm_debugfs_create_files(sti_drm_dbg_list,

	drm_debugfs_create_files(sti_drm_dbg_list,

				 ARRAY_SIZE(sti_drm_dbg_list),

				 minor->debugfs_root, minor);

	if (ret)

		goto err;



	debugfs_create_file("fps_show", S_IRUGO | S_IWUSR, minor->debugfs_root,

			    minor->dev, &sti_drm_fps_fops);



	DRM_INFO("%s: debugfs installed\n", DRIVER_NAME);

	return 0;

err:

	DRM_ERROR("%s: cannot install debugfs\n", DRIVER_NAME);

	return ret;

}



static const struct drm_mode_config_funcs sti_mode_config_funcs = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE