drm/qxl: Remove qxl_debugfs_remove_files()

drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so it's not necessary to call drm_debugfs_remove_files().

Cc: airlied@linux.ie
Cc: kraxel@redhat.com
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Link: http://patchwork.freedesktop.org/patch/msgid/20170307204924.1002-4-noralf@tronnes.org
[ kraxel: solved conflict ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
index 8e6c7800322626c8eb7d71cbc1afc9140b418a11..ffe821b61f7d75a9acbc1623c067ebb3e158a281 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
@@ -129,16 +129,3 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
 #endif
        return 0;
 }
-
-void qxl_debugfs_remove_files(struct qxl_device *qdev)
-{
-#if defined(CONFIG_DEBUG_FS)
-       unsigned i;
-
-       for (i = 0; i < qdev->debugfs_count; i++) {
-               drm_debugfs_remove_files(qdev->debugfs[i].files,
-                                        qdev->debugfs[i].num_files,
-                                        qdev->ddev.primary);
-       }
-#endif
-}

diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
index b43320fe5da5343de88904b28113c91b413eff8c..5ea290a33a6897dda9d91a4fefaf027b35369ab7 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_drv.h
+++ b/drivers/gpu/drm/qxl/qxl_drv.h
@@ -230,7 +230,6 @@ int qxl_debugfs_add_files(struct qxl_device *rdev,
                             struct drm_info_list *files,
                             unsigned nfiles);
 int qxl_debugfs_fence_init(struct qxl_device *rdev);
-void qxl_debugfs_remove_files(struct qxl_device *qdev);
 
 struct qxl_device;
 

diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c
index a9a741cda4030ccd741e6b5d1a65c9116ca56ccf..c5716a0ca3b8b2c4afd3b1f60948127bedc90e0a 100644 (file)
--- a/drivers/gpu/drm/qxl/qxl_kms.c
+++ b/drivers/gpu/drm/qxl/qxl_kms.c
@@ -262,5 +262,4 @@ void qxl_device_fini(struct qxl_device *qdev)
        iounmap(qdev->ram_header);
        iounmap(qdev->rom);
        qdev->rom = NULL;
-       qxl_debugfs_remove_files(qdev);
 }