aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2017-01-26 17:56:19 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-03-01 10:09:52 -0500
commite663112e27807b10cbb7769c89462faff8da06a9 (patch)
treec26c048108635d30d696a1bc5414edac29f8f6b7
parent1a54082a950c969cb3234167f788af99e2062f29 (diff)
drm/virtio: Remove virtio_gpu_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-18-noralf@tronnes.org
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_debugfs.c8
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_drv.c1
-rw-r--r--drivers/gpu/drm/virtio/virtgpu_drv.h1
3 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_debugfs.c b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
index 512263919282..f51240aa720d 100644
--- a/drivers/gpu/drm/virtio/virtgpu_debugfs.c
+++ b/drivers/gpu/drm/virtio/virtgpu_debugfs.c
@@ -54,11 +54,3 @@ virtio_gpu_debugfs_init(struct drm_minor *minor)
54 minor->debugfs_root, minor); 54 minor->debugfs_root, minor);
55 return 0; 55 return 0;
56} 56}
57
58void
59virtio_gpu_debugfs_takedown(struct drm_minor *minor)
60{
61 drm_debugfs_remove_files(virtio_gpu_debugfs_list,
62 VIRTIO_GPU_DEBUGFS_ENTRIES,
63 minor);
64}
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c
index d82489815096..2d29b0141545 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -126,7 +126,6 @@ static struct drm_driver driver = {
126 126
127#if defined(CONFIG_DEBUG_FS) 127#if defined(CONFIG_DEBUG_FS)
128 .debugfs_init = virtio_gpu_debugfs_init, 128 .debugfs_init = virtio_gpu_debugfs_init,
129 .debugfs_cleanup = virtio_gpu_debugfs_takedown,
130#endif 129#endif
131 .prime_handle_to_fd = drm_gem_prime_handle_to_fd, 130 .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
132 .prime_fd_to_handle = drm_gem_prime_fd_to_handle, 131 .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h
index 2f766735c16d..d59f68936306 100644
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h
+++ b/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -422,6 +422,5 @@ static inline void virtio_gpu_object_unreserve(struct virtio_gpu_object *bo)
422 422
423/* virgl debufs */ 423/* virgl debufs */
424int virtio_gpu_debugfs_init(struct drm_minor *minor); 424int virtio_gpu_debugfs_init(struct drm_minor *minor);
425void virtio_gpu_debugfs_takedown(struct drm_minor *minor);
426 425
427#endif 426#endif