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: Noralf Trønnes <noralf@tronnes.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-4-noralf@tronnes.org

diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c
index 7fd88a09304b0d7968d1997b35eedf58a0e8b3b9..e5b738660d66c0a6bc7324d0b047dc5612cc4115 100644 (file)
--- a/drivers/gpu/drm/drm_atomic.c
+++ b/drivers/gpu/drm/drm_atomic.c
@@ -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
 
 /*

diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index 724c329186d58675e3a2471957681be26f433bd9..1bdcfd56669539c306a3738c09df7d5d406c2060 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -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,

diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c
index 04b0af3c903e4a7f16ea86db54a044e6d9c7e55e..2290a74a6e466f2a2fda546c53a2077fd6753c48 100644 (file)
--- a/drivers/gpu/drm/drm_debugfs.c
+++ b/drivers/gpu/drm/drm_debugfs.c
@@ -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);