Commit 7ce84471 authored by Wambui Karuga's avatar Wambui Karuga Committed by Daniel Vetter
Browse files

drm: convert .debugfs_init() hook to return void. 

As a result of commit 987d65d0 (drm: debugfs: make
drm_debugfs_create_files() never fail) and changes to various debugfs
functions in drm/core and across various drivers, there is no need for
the drm_driver.debugfs_init() hook to have a return value. Therefore,
declare it as void.

This also includes refactoring all users of the .debugfs_init() hook to
return void across the subsystem.

v2: include changes to the hook and drivers that use it in one patch to
prevent driver breakage and enable individual successful compilation of
this change.

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-18-wambui.karugax@gmail.com
parent 0df10823

drivers/gpu/drm/arc/arcpgu_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -137,12 +137,11 @@ static struct drm_info_list arcpgu_debugfs_list[] = { 
	{ "clocks", arcpgu_show_pxlclock, 0 },

};



static int arcpgu_debugfs_init(struct drm_minor *minor)

static void arcpgu_debugfs_init(struct drm_minor *minor)

{

	drm_debugfs_create_files(arcpgu_debugfs_list,

				 ARRAY_SIZE(arcpgu_debugfs_list),

				 minor->debugfs_root, minor);

	return 0;

}

#endif

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -224,12 +224,11 @@ static struct drm_info_list hdlcd_debugfs_list[] = { 
	{ "clocks", hdlcd_show_pxlclock, 0 },

};



static int hdlcd_debugfs_init(struct drm_minor *minor)

static void hdlcd_debugfs_init(struct drm_minor *minor)

{

	drm_debugfs_create_files(hdlcd_debugfs_list,

				 ARRAY_SIZE(hdlcd_debugfs_list),

				 minor->debugfs_root, minor);

	return 0;

}

#endif

drivers/gpu/drm/arm/malidp_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static const struct file_operations malidp_debugfs_fops = { 
	.release = single_release,

};



static int malidp_debugfs_init(struct drm_minor *minor)

static void malidp_debugfs_init(struct drm_minor *minor)

{

	struct malidp_drm *malidp = minor->dev->dev_private;
@@ -557,7 +557,6 @@ static int malidp_debugfs_init(struct drm_minor *minor) 
	spin_lock_init(&malidp->errors_lock);

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

			    minor->dev, &malidp_debugfs_fops);

	return 0;

}



#endif //CONFIG_DEBUG_FS

drivers/gpu/drm/drm_atomic.c

+1 −2
Original line number Diff line number Diff line
@@ -1641,11 +1641,10 @@ static const struct drm_info_list drm_atomic_debugfs_list[] = { 
	{"state", drm_state_info, 0},

};



int drm_atomic_debugfs_init(struct drm_minor *minor)

void drm_atomic_debugfs_init(struct drm_minor *minor)

{

	drm_debugfs_create_files(drm_atomic_debugfs_list,

				 ARRAY_SIZE(drm_atomic_debugfs_list),

				 minor->debugfs_root, minor);

	return 0;

}

#endif

drivers/gpu/drm/drm_client.c

+1 −3
Original line number Diff line number Diff line
@@ -457,12 +457,10 @@ static const struct drm_info_list drm_client_debugfs_list[] = { 
	{ "internal_clients", drm_client_debugfs_internal_clients, 0 },

};



int drm_client_debugfs_init(struct drm_minor *minor)

void drm_client_debugfs_init(struct drm_minor *minor)

{

	drm_debugfs_create_files(drm_client_debugfs_list,

				 ARRAY_SIZE(drm_client_debugfs_list),

				 minor->debugfs_root, minor);



	return 0;

}

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE