| Message ID | 20170122181117.8210-3-noralf@tronnes.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Jan 22, 2017 at 07:11:10PM +0100, Noralf Trønnes wrote: > Instead of having the drivers call drm_debugfs_remove_files() in > their drm_driver->debugfs_cleanup hook, do it automatically by > traversing minor->debugfs_list. > Also use debugfs_remove_recursive() so drivers who add their own > debugfs files don't have to keep track of them for removal. > > Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Makes sense, but that leaves us with a pile of dead code in drivers? Can you pls go through them and remove this all (including the debugfs_cleanup hook), and then removing the remaining (now dead) code in the core? Thanks, Daniel > --- > drivers/gpu/drm/drm_debugfs.c | 17 +++++++++++++++-- > 1 file changed, 15 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c > index 37fd612..0510ce2 100644 > --- a/drivers/gpu/drm/drm_debugfs.c > +++ b/drivers/gpu/drm/drm_debugfs.c > @@ -218,6 +218,19 @@ int drm_debugfs_remove_files(const struct drm_info_list *files, int count, > } > EXPORT_SYMBOL(drm_debugfs_remove_files); > > +static void drm_debugfs_remove_all_files(struct drm_minor *minor) > +{ > + struct drm_info_node *node, *tmp; > + > + mutex_lock(&minor->debugfs_lock); > + list_for_each_entry_safe(node, tmp, &minor->debugfs_list, list) { > + debugfs_remove(node->dent); > + list_del(&node->list); > + kfree(node); > + } > + mutex_unlock(&minor->debugfs_lock); > +} > + > /** > * Cleanup the debugfs filesystem resources. > * > @@ -245,9 +258,9 @@ int drm_debugfs_cleanup(struct drm_minor *minor) > } > } > > - drm_debugfs_remove_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES, minor); > + drm_debugfs_remove_all_files(minor); > > - debugfs_remove(minor->debugfs_root); > + debugfs_remove_recursive(minor->debugfs_root); > minor->debugfs_root = NULL; > > return 0; > -- > 2.10.2 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 37fd612..0510ce2 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c @@ -218,6 +218,19 @@ int drm_debugfs_remove_files(const struct drm_info_list *files, int count, } EXPORT_SYMBOL(drm_debugfs_remove_files); +static void drm_debugfs_remove_all_files(struct drm_minor *minor) +{ + struct drm_info_node *node, *tmp; + + mutex_lock(&minor->debugfs_lock); + list_for_each_entry_safe(node, tmp, &minor->debugfs_list, list) { + debugfs_remove(node->dent); + list_del(&node->list); + kfree(node); + } + mutex_unlock(&minor->debugfs_lock); +} + /** * Cleanup the debugfs filesystem resources. * @@ -245,9 +258,9 @@ int drm_debugfs_cleanup(struct drm_minor *minor) } } - drm_debugfs_remove_files(drm_debugfs_list, DRM_DEBUGFS_ENTRIES, minor); + drm_debugfs_remove_all_files(minor); - debugfs_remove(minor->debugfs_root); + debugfs_remove_recursive(minor->debugfs_root); minor->debugfs_root = NULL; return 0;
Instead of having the drivers call drm_debugfs_remove_files() in their drm_driver->debugfs_cleanup hook, do it automatically by traversing minor->debugfs_list. Also use debugfs_remove_recursive() so drivers who add their own debugfs files don't have to keep track of them for removal. Signed-off-by: Noralf Trønnes <noralf@tronnes.org> --- drivers/gpu/drm/drm_debugfs.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)