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>
This commit is contained in:
parent
1bdb5d5b8e
commit
34c9d52410
@ -129,16 +129,3 @@ int qxl_debugfs_add_files(struct qxl_device *qdev,
|
|||||||
#endif
|
#endif
|
||||||
return 0;
|
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
|
|
||||||
}
|
|
||||||
|
@ -230,7 +230,6 @@ int qxl_debugfs_add_files(struct qxl_device *rdev,
|
|||||||
struct drm_info_list *files,
|
struct drm_info_list *files,
|
||||||
unsigned nfiles);
|
unsigned nfiles);
|
||||||
int qxl_debugfs_fence_init(struct qxl_device *rdev);
|
int qxl_debugfs_fence_init(struct qxl_device *rdev);
|
||||||
void qxl_debugfs_remove_files(struct qxl_device *qdev);
|
|
||||||
|
|
||||||
struct qxl_device;
|
struct qxl_device;
|
||||||
|
|
||||||
|
@ -262,5 +262,4 @@ void qxl_device_fini(struct qxl_device *qdev)
|
|||||||
iounmap(qdev->ram_header);
|
iounmap(qdev->ram_header);
|
||||||
iounmap(qdev->rom);
|
iounmap(qdev->rom);
|
||||||
qdev->rom = NULL;
|
qdev->rom = NULL;
|
||||||
qxl_debugfs_remove_files(qdev);
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user