diff options
| author | Noralf Trønnes <noralf@tronnes.org> | 2017-01-26 17:56:18 -0500 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-01-30 03:48:48 -0500 |
| commit | 55d6616585363ff2aa9430bfe1ff1345bdc0599a (patch) | |
| tree | 01c77691530ac7ee792d7a19d76f09c069f8227c /drivers/gpu | |
| parent | 8c96c678011eeb1676da18f203e90dea7e0d69d2 (diff) | |
drm/vc4: Remove vc4_debugfs_cleanup()
drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so the drm_driver.debugfs_cleanup callback is not
needed.
Cc: eric@anholt.net
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170126225621.12314-17-noralf@tronnes.org
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_debugfs.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.h | 1 |
3 files changed, 0 insertions, 8 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_debugfs.c b/drivers/gpu/drm/vc4/vc4_debugfs.c index caf817bac885..c4d5e6a8d6f2 100644 --- a/drivers/gpu/drm/vc4/vc4_debugfs.c +++ b/drivers/gpu/drm/vc4/vc4_debugfs.c | |||
| @@ -36,9 +36,3 @@ vc4_debugfs_init(struct drm_minor *minor) | |||
| 36 | return drm_debugfs_create_files(vc4_debugfs_list, VC4_DEBUGFS_ENTRIES, | 36 | return drm_debugfs_create_files(vc4_debugfs_list, VC4_DEBUGFS_ENTRIES, |
| 37 | minor->debugfs_root, minor); | 37 | minor->debugfs_root, minor); |
| 38 | } | 38 | } |
| 39 | |||
| 40 | void | ||
| 41 | vc4_debugfs_cleanup(struct drm_minor *minor) | ||
| 42 | { | ||
| 43 | drm_debugfs_remove_files(vc4_debugfs_list, VC4_DEBUGFS_ENTRIES, minor); | ||
| 44 | } | ||
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index ac09ca7ff430..e4f42ebee517 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c | |||
| @@ -145,7 +145,6 @@ static struct drm_driver vc4_drm_driver = { | |||
| 145 | 145 | ||
| 146 | #if defined(CONFIG_DEBUG_FS) | 146 | #if defined(CONFIG_DEBUG_FS) |
| 147 | .debugfs_init = vc4_debugfs_init, | 147 | .debugfs_init = vc4_debugfs_init, |
| 148 | .debugfs_cleanup = vc4_debugfs_cleanup, | ||
| 149 | #endif | 148 | #endif |
| 150 | 149 | ||
| 151 | .gem_create_object = vc4_create_object, | 150 | .gem_create_object = vc4_create_object, |
diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h index affcdeb70aa9..78e3e5a43fb0 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h | |||
| @@ -457,7 +457,6 @@ int vc4_crtc_get_vblank_timestamp(struct drm_device *dev, unsigned int crtc_id, | |||
| 457 | 457 | ||
| 458 | /* vc4_debugfs.c */ | 458 | /* vc4_debugfs.c */ |
| 459 | int vc4_debugfs_init(struct drm_minor *minor); | 459 | int vc4_debugfs_init(struct drm_minor *minor); |
| 460 | void vc4_debugfs_cleanup(struct drm_minor *minor); | ||
| 461 | 460 | ||
| 462 | /* vc4_drv.c */ | 461 | /* vc4_drv.c */ |
| 463 | void __iomem *vc4_ioremap_regs(struct platform_device *dev, int index); | 462 | void __iomem *vc4_ioremap_regs(struct platform_device *dev, int index); |
