diff options
author | Noralf Trønnes <noralf@tronnes.org> | 2017-01-26 17:56:20 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-03-01 10:09:52 -0500 |
commit | cc14d46ba1cf21d2f1163add493e07ffbe0e222b (patch) | |
tree | 898a0dc0f15da50fc2e98631910aa02f3d1dc203 | |
parent | e663112e27807b10cbb7769c89462faff8da06a9 (diff) |
drm/qxl: Remove qxl_debugfs_takedown()
drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so the drm_driver.debugfs_cleanup callback is not
needed.
Cc: airlied@linux.ie
Cc: kraxel@redhat.com
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-19-noralf@tronnes.org
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_debugfs.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.h | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c index d58751c94618..8e6c78003226 100644 --- a/drivers/gpu/drm/qxl/qxl_debugfs.c +++ b/drivers/gpu/drm/qxl/qxl_debugfs.c | |||
@@ -100,15 +100,6 @@ qxl_debugfs_init(struct drm_minor *minor) | |||
100 | return 0; | 100 | return 0; |
101 | } | 101 | } |
102 | 102 | ||
103 | void | ||
104 | qxl_debugfs_takedown(struct drm_minor *minor) | ||
105 | { | ||
106 | #if defined(CONFIG_DEBUG_FS) | ||
107 | drm_debugfs_remove_files(qxl_debugfs_list, QXL_DEBUGFS_ENTRIES, | ||
108 | minor); | ||
109 | #endif | ||
110 | } | ||
111 | |||
112 | int qxl_debugfs_add_files(struct qxl_device *qdev, | 103 | int qxl_debugfs_add_files(struct qxl_device *qdev, |
113 | struct drm_info_list *files, | 104 | struct drm_info_list *files, |
114 | unsigned nfiles) | 105 | unsigned nfiles) |
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 215ef001b718..abf7b8360361 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c | |||
@@ -269,7 +269,6 @@ static struct drm_driver qxl_driver = { | |||
269 | .dumb_destroy = drm_gem_dumb_destroy, | 269 | .dumb_destroy = drm_gem_dumb_destroy, |
270 | #if defined(CONFIG_DEBUG_FS) | 270 | #if defined(CONFIG_DEBUG_FS) |
271 | .debugfs_init = qxl_debugfs_init, | 271 | .debugfs_init = qxl_debugfs_init, |
272 | .debugfs_cleanup = qxl_debugfs_takedown, | ||
273 | #endif | 272 | #endif |
274 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, | 273 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, |
275 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, | 274 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, |
diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h index 0c313e563632..c0481706e4b0 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.h +++ b/drivers/gpu/drm/qxl/qxl_drv.h | |||
@@ -523,7 +523,6 @@ int qxl_garbage_collect(struct qxl_device *qdev); | |||
523 | /* debugfs */ | 523 | /* debugfs */ |
524 | 524 | ||
525 | int qxl_debugfs_init(struct drm_minor *minor); | 525 | int qxl_debugfs_init(struct drm_minor *minor); |
526 | void qxl_debugfs_takedown(struct drm_minor *minor); | ||
527 | int qxl_ttm_debugfs_init(struct qxl_device *qdev); | 526 | int qxl_ttm_debugfs_init(struct qxl_device *qdev); |
528 | 527 | ||
529 | /* qxl_prime.c */ | 528 | /* qxl_prime.c */ |