drm/armada: Remove armada_drm_debugfs_cleanup()

drm_debugfs_cleanup() now removes all minor->debugfs_list entries
automatically, so no need to do this explicitly. Additionally it
uses debugfs_remove_recursive() to clean up the debugfs files,
so no need for adding fake drm_info_node entries.
And finally there's no need to clean up on error,
drm_debugfs_cleanup() is called in the error path.

Cc: linux@armlinux.org.uk
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-6-noralf@tronnes.org

diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
index a8020cf9da2ef1a7fc34f0048684f801e6787407..6758c3a83de24bde1d7201a2babfa70dc45bbf56 100644 (file)
--- a/drivers/gpu/drm/armada/armada_debugfs.c
+++ b/drivers/gpu/drm/armada/armada_debugfs.c
@@ -107,40 +107,9 @@ static struct drm_info_list armada_debugfs_list[] = {
 };
 #define ARMADA_DEBUGFS_ENTRIES ARRAY_SIZE(armada_debugfs_list)
 
-static int drm_add_fake_info_node(struct drm_minor *minor, struct dentry *ent,
-       const void *key)
-{
-       struct drm_info_node *node;
-
-       node = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL);
-       if (!node) {
-               debugfs_remove(ent);
-               return -ENOMEM;
-       }
-
-       node->minor = minor;
-       node->dent = ent;
-       node->info_ent = (void *) key;
-
-       mutex_lock(&minor->debugfs_lock);
-       list_add(&node->list, &minor->debugfs_list);
-       mutex_unlock(&minor->debugfs_lock);
-
-       return 0;
-}
-
-static int armada_debugfs_create(struct dentry *root, struct drm_minor *minor,
-       const char *name, umode_t mode, const struct file_operations *fops)
-{
-       struct dentry *de;
-
-       de = debugfs_create_file(name, mode, root, minor->dev, fops);
-
-       return drm_add_fake_info_node(minor, de, fops);
-}
-
 int armada_drm_debugfs_init(struct drm_minor *minor)
 {
+       struct dentry *de;
        int ret;
 
        ret = drm_debugfs_create_files(armada_debugfs_list,
@@ -149,29 +118,15 @@ int armada_drm_debugfs_init(struct drm_minor *minor)
        if (ret)
                return ret;
 
-       ret = armada_debugfs_create(minor->debugfs_root, minor,
-                                  "reg", S_IFREG | S_IRUSR, &fops_reg_r);
-       if (ret)
-               goto err_1;
+       de = debugfs_create_file("reg", S_IFREG | S_IRUSR,
+                                minor->debugfs_root, minor->dev, &fops_reg_r);
+       if (!de)
+               return -ENOMEM;
 
-       ret = armada_debugfs_create(minor->debugfs_root, minor,
-                               "reg_wr", S_IFREG | S_IWUSR, &fops_reg_w);
-       if (ret)
-               goto err_2;
-       return ret;
-
- err_2:
-       drm_debugfs_remove_files((struct drm_info_list *)&fops_reg_r, 1, minor);
- err_1:
-       drm_debugfs_remove_files(armada_debugfs_list, ARMADA_DEBUGFS_ENTRIES,
-                                minor);
-       return ret;
-}
+       de = debugfs_create_file("reg_wr", S_IFREG | S_IWUSR,
+                                minor->debugfs_root, minor->dev, &fops_reg_w);
+       if (!de)
+               return -ENOMEM;
 
-void armada_drm_debugfs_cleanup(struct drm_minor *minor)
-{
-       drm_debugfs_remove_files((struct drm_info_list *)&fops_reg_w, 1, minor);
-       drm_debugfs_remove_files((struct drm_info_list *)&fops_reg_r, 1, minor);
-       drm_debugfs_remove_files(armada_debugfs_list, ARMADA_DEBUGFS_ENTRIES,
-                                minor);
+       return 0;
 }

diff --git a/drivers/gpu/drm/armada/armada_drm.h b/drivers/gpu/drm/armada/armada_drm.h
index 77952d559a3c0370e126c0d0610512db9c0227d5..b064879ecdbd1073a379dbb438854094cdd30f80 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drm.h
+++ b/drivers/gpu/drm/armada/armada_drm.h
@@ -90,6 +90,5 @@ void armada_fbdev_fini(struct drm_device *);
 int armada_overlay_plane_create(struct drm_device *, unsigned long);
 
 int armada_drm_debugfs_init(struct drm_minor *);
-void armada_drm_debugfs_cleanup(struct drm_minor *);
 
 #endif

diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c
index 737bfcbce87bbba21eb547a2eeb72c206e7c5073..1952e8748fea4788fc5664090fff3f62586b7280 100644 (file)
--- a/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@ -209,9 +209,6 @@ static void armada_drm_unbind(struct device *dev)
        drm_kms_helper_poll_fini(&priv->drm);
        armada_fbdev_fini(&priv->drm);
 
-#ifdef CONFIG_DEBUG_FS
-       armada_drm_debugfs_cleanup(priv->drm.primary);
-#endif
        drm_dev_unregister(&priv->drm);
 
        component_unbind_all(dev, &priv->drm);