diff options
author | Noralf Trønnes <noralf@tronnes.org> | 2017-01-26 17:56:13 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-27 09:25:53 -0500 |
commit | c259e81bcd0e7b7e6ecdde4d5d4ce26aed409575 (patch) | |
tree | c1fbacef84ebfba260b262cccf70d487cd78046c | |
parent | e0dfccf48339b9a9be0fa8e906cfcc19dac3c82b (diff) |
drm/omap: Remove omap_debugfs_cleanup()
drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so the drm_driver.debugfs_cleanup callback is not
needed.
Cc: tomi.valkeinen@ti.com
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-12-noralf@tronnes.org
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_debugfs.c | 9 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/omapdrm/omap_drv.h | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c b/drivers/gpu/drm/omapdrm/omap_debugfs.c index bf65862daf62..19b716745623 100644 --- a/drivers/gpu/drm/omapdrm/omap_debugfs.c +++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c | |||
@@ -123,13 +123,4 @@ int omap_debugfs_init(struct drm_minor *minor) | |||
123 | return ret; | 123 | return ret; |
124 | } | 124 | } |
125 | 125 | ||
126 | void omap_debugfs_cleanup(struct drm_minor *minor) | ||
127 | { | ||
128 | drm_debugfs_remove_files(omap_debugfs_list, | ||
129 | ARRAY_SIZE(omap_debugfs_list), minor); | ||
130 | if (dmm_is_available()) | ||
131 | drm_debugfs_remove_files(omap_dmm_debugfs_list, | ||
132 | ARRAY_SIZE(omap_dmm_debugfs_list), minor); | ||
133 | } | ||
134 | |||
135 | #endif | 126 | #endif |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index 4fd2e1799a88..42330e0c3324 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c | |||
@@ -812,7 +812,6 @@ static struct drm_driver omap_drm_driver = { | |||
812 | .disable_vblank = omap_irq_disable_vblank, | 812 | .disable_vblank = omap_irq_disable_vblank, |
813 | #ifdef CONFIG_DEBUG_FS | 813 | #ifdef CONFIG_DEBUG_FS |
814 | .debugfs_init = omap_debugfs_init, | 814 | .debugfs_init = omap_debugfs_init, |
815 | .debugfs_cleanup = omap_debugfs_cleanup, | ||
816 | #endif | 815 | #endif |
817 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, | 816 | .prime_handle_to_fd = drm_gem_prime_handle_to_fd, |
818 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, | 817 | .prime_fd_to_handle = drm_gem_prime_fd_to_handle, |
diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 7d9dd5400cef..8b113ba39da0 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h | |||
@@ -116,7 +116,6 @@ struct omap_drm_private { | |||
116 | 116 | ||
117 | #ifdef CONFIG_DEBUG_FS | 117 | #ifdef CONFIG_DEBUG_FS |
118 | int omap_debugfs_init(struct drm_minor *minor); | 118 | int omap_debugfs_init(struct drm_minor *minor); |
119 | void omap_debugfs_cleanup(struct drm_minor *minor); | ||
120 | void omap_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m); | 119 | void omap_framebuffer_describe(struct drm_framebuffer *fb, struct seq_file *m); |
121 | void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m); | 120 | void omap_gem_describe(struct drm_gem_object *obj, struct seq_file *m); |
122 | void omap_gem_describe_objects(struct list_head *list, struct seq_file *m); | 121 | void omap_gem_describe_objects(struct list_head *list, struct seq_file *m); |