drm/nouveau: Remove nouveau_drm_debugfs_cleanup()

drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so the drm_driver.debugfs_cleanup callback is not
needed. Additionally it uses debugfs_remove_recursive() to clean
up the debugfs files, so no need for adding fake drm_info_node
entries.

Cc: bskeggs@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-11-noralf@tronnes.org

diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.c b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
index fd64dfdc7d4f54fb503318936eb8b6c65104a6d3..963a4dba8213eb6080ff3713cbbdbb20ddb4b61e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.c
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.c
@@ -49,8 +49,8 @@ nouveau_debugfs_vbios_image(struct seq_file *m, void *data)
 static int
 nouveau_debugfs_pstate_get(struct seq_file *m, void *data)
 {
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct nouveau_debugfs *debugfs = nouveau_debugfs(node->minor->dev);
+       struct drm_device *drm = m->private;
+       struct nouveau_debugfs *debugfs = nouveau_debugfs(drm);
        struct nvif_object *ctrl = &debugfs->ctrl;
        struct nvif_control_pstate_info_v0 info = {};
        int ret, i;
@@ -120,8 +120,8 @@ nouveau_debugfs_pstate_set(struct file *file, const char __user *ubuf,
                           size_t len, loff_t *offp)
 {
        struct seq_file *m = file->private_data;
-       struct drm_info_node *node = (struct drm_info_node *) m->private;
-       struct nouveau_debugfs *debugfs = nouveau_debugfs(node->minor->dev);
+       struct drm_device *drm = m->private;
+       struct nouveau_debugfs *debugfs = nouveau_debugfs(drm);
        struct nvif_object *ctrl = &debugfs->ctrl;
        struct nvif_control_pstate_user_v0 args = { .pwrsrc = -EINVAL };
        char buf[32] = {}, *tmp, *cur = buf;
@@ -192,42 +192,19 @@ static const struct nouveau_debugfs_files {
        {"pstate", &nouveau_pstate_fops},
 };
 
-static int
-nouveau_debugfs_create_file(struct drm_minor *minor,
-               const struct nouveau_debugfs_files *ndf)
-{
-       struct drm_info_node *node;
-
-       node = kmalloc(sizeof(*node), GFP_KERNEL);
-       if (node == NULL)
-               return -ENOMEM;
-
-       node->minor = minor;
-       node->info_ent = (const void *)ndf->fops;
-       node->dent = debugfs_create_file(ndf->name, S_IRUGO | S_IWUSR,
-                                        minor->debugfs_root, node, ndf->fops);
-       if (!node->dent) {
-               kfree(node);
-               return -ENOMEM;
-       }
-
-       mutex_lock(&minor->debugfs_lock);
-       list_add(&node->list, &minor->debugfs_list);
-       mutex_unlock(&minor->debugfs_lock);
-       return 0;
-}
-
 int
 nouveau_drm_debugfs_init(struct drm_minor *minor)
 {
-       int i, ret;
+       struct dentry *dentry;
+       int i;
 
        for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) {
-               ret = nouveau_debugfs_create_file(minor,
-                                                 &nouveau_debugfs_files[i]);
-
-               if (ret)
-                       return ret;
+               dentry = debugfs_create_file(nouveau_debugfs_files[i].name,
+                                            S_IRUGO | S_IWUSR,
+                                            minor->debugfs_root, minor->dev,
+                                            nouveau_debugfs_files[i].fops);
+               if (!dentry)
+                       return -ENOMEM;
        }
 
        return drm_debugfs_create_files(nouveau_debugfs_list,
@@ -235,21 +212,6 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)
                                        minor->debugfs_root, minor);
 }
 
-void
-nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
-{
-       int i;
-
-       drm_debugfs_remove_files(nouveau_debugfs_list, NOUVEAU_DEBUGFS_ENTRIES,
-                                minor);
-
-       for (i = 0; i < ARRAY_SIZE(nouveau_debugfs_files); i++) {
-               drm_debugfs_remove_files((struct drm_info_list *)
-                                        nouveau_debugfs_files[i].fops,
-                                        1, minor);
-       }
-}
-
 int
 nouveau_debugfs_init(struct nouveau_drm *drm)
 {

diff --git a/drivers/gpu/drm/nouveau/nouveau_debugfs.h b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
index eab58811417a20fb72ad35f6017e6e11af78fd55..b799f8dfb2b244dddd477dd97642a8b8450d4e66 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_debugfs.h
+++ b/drivers/gpu/drm/nouveau/nouveau_debugfs.h
@@ -18,7 +18,6 @@ nouveau_debugfs(struct drm_device *dev)
 }
 
 extern int  nouveau_drm_debugfs_init(struct drm_minor *);
-extern void nouveau_drm_debugfs_cleanup(struct drm_minor *);
 extern int  nouveau_debugfs_init(struct nouveau_drm *);
 extern void nouveau_debugfs_fini(struct nouveau_drm *);
 #else
@@ -28,11 +27,6 @@ nouveau_drm_debugfs_init(struct drm_minor *minor)
        return 0;
 }
 
-static inline void
-nouveau_drm_debugfs_cleanup(struct drm_minor *minor)
-{
-}
-
 static inline int
 nouveau_debugfs_init(struct nouveau_drm *drm)
 {

diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index d234a3b70bad6a50e18c1c74ec5280cb50b1049f..f0bb7606eb8b77949b97e3b7989ecd0cdf53e0fd 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
@@ -980,7 +980,6 @@ driver_stub = {
 
 #if defined(CONFIG_DEBUG_FS)
        .debugfs_init = nouveau_drm_debugfs_init,
-       .debugfs_cleanup = nouveau_drm_debugfs_cleanup,
 #endif
 
        .enable_vblank = nouveau_display_vblank_enable,