Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0c6d00 authored by Noralf Trønnes's avatar Noralf Trønnes Committed by Daniel Vetter
Browse files

drm/atomic: Remove drm_atomic_debugfs_cleanup() 



drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so no need to call drm_debugfs_remove_files().

Signed-off-by: default avatarNoralf Trønnes <noralf@tronnes.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-4-noralf@tronnes.org
parent a67834f8

drivers/gpu/drm/drm_atomic.c

+0 −7
Original line number Diff line number Diff line
@@ -1727,13 +1727,6 @@ int drm_atomic_debugfs_init(struct drm_minor *minor) 
			ARRAY_SIZE(drm_atomic_debugfs_list),

			minor->debugfs_root, minor);

}



int drm_atomic_debugfs_cleanup(struct drm_minor *minor)

{

	return drm_debugfs_remove_files(drm_atomic_debugfs_list,

					ARRAY_SIZE(drm_atomic_debugfs_list),

					minor);

}

#endif



/*

drivers/gpu/drm/drm_crtc_internal.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, 
#ifdef CONFIG_DEBUG_FS

struct drm_minor;

int drm_atomic_debugfs_init(struct drm_minor *minor);

int drm_atomic_debugfs_cleanup(struct drm_minor *minor);

#endif



int drm_atomic_get_property(struct drm_mode_object *obj,

drivers/gpu/drm/drm_debugfs.c

+0 −9
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ static void drm_debugfs_remove_all_files(struct drm_minor *minor) 
int drm_debugfs_cleanup(struct drm_minor *minor)

{

	struct drm_device *dev = minor->dev;

	int ret;



	if (!minor->debugfs_root)

		return 0;
@@ -251,14 +250,6 @@ int drm_debugfs_cleanup(struct drm_minor *minor) 
	if (dev->driver->debugfs_cleanup)

		dev->driver->debugfs_cleanup(minor);



	if (drm_core_check_feature(dev, DRIVER_ATOMIC)) {

		ret = drm_atomic_debugfs_cleanup(minor);

		if (ret) {

			DRM_ERROR("DRM: Failed to remove atomic debugfs entries\n");

			return ret;

		}

	}



	drm_debugfs_remove_all_files(minor);



	debugfs_remove_recursive(minor->debugfs_root);