of: remove /proc/device-tree

The same data is now available in sysfs, so we can remove the code
that exports it in /proc and replace it with a symlink to the sysfs
version.

Tested on versatile qemu model and mpc5200 eval board. More testing
would be appreciated.

v5: Fixed up conflicts with mainline changes

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David S. Miller <davem@davemloft.net>
Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>

1 files changed, 1 insertions, 51 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 3b70a468c8ab..ed3e70b84957 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -281,11 +281,9 @@ static int __init of_init(void)
                 __of_node_add(np);
         mutex_unlock(&of_aliases_mutex);
 
-#if !defined(CONFIG_PROC_DEVICETREE)
-        /* Symlink to the new tree when PROC_DEVICETREE is disabled */
+        /* Symlink in /proc as required by userspace ABI */
         if (of_allnodes)
                 proc_symlink("device-tree", NULL, "/sys/firmware/devicetree/base");
-#endif /* CONFIG_PROC_DEVICETREE */
 
         return 0;
 }
@@ -1690,12 +1688,6 @@ int of_add_property(struct device_node *np, struct property *prop)
 
         __of_add_property_sysfs(np, prop);
 
-#ifdef CONFIG_PROC_DEVICETREE
-        /* try to add to proc as well if it was initialized */
-        if (!rc && np->pde)
-                proc_device_tree_add_prop(np->pde, prop);
-#endif /* CONFIG_PROC_DEVICETREE */
-
         return rc;
 }
 
@@ -1742,12 +1734,6 @@ int of_remove_property(struct device_node *np, struct property *prop)
 
         sysfs_remove_bin_file(&np->kobj, &prop->attr);
 
-#ifdef CONFIG_PROC_DEVICETREE
-        /* try to remove the proc node as well */
-        if (np->pde)
-                proc_device_tree_remove_prop(np->pde, prop);
-#endif /* CONFIG_PROC_DEVICETREE */
-
         return 0;
 }
 
@@ -1803,12 +1789,6 @@ int of_update_property(struct device_node *np, struct property *newprop)
         if (!found)
                 return -ENODEV;
 
-#ifdef CONFIG_PROC_DEVICETREE
-        /* try to add to proc as well if it was initialized */
-        if (np->pde)
-                proc_device_tree_update_prop(np->pde, newprop, oldprop);
-#endif /* CONFIG_PROC_DEVICETREE */
-
         return 0;
 }
 
@@ -1843,22 +1823,6 @@ int of_reconfig_notify(unsigned long action, void *p)
         return notifier_to_errno(rc);
 }
 
-#ifdef CONFIG_PROC_DEVICETREE
-static void of_add_proc_dt_entry(struct device_node *dn)
-{
-        struct proc_dir_entry *ent;
-
-        ent = proc_mkdir(strrchr(dn->full_name, '/') + 1, dn->parent->pde);
-        if (ent)
-                proc_device_tree_add_node(dn, ent);
-}
-#else
-static void of_add_proc_dt_entry(struct device_node *dn)
-{
-        return;
-}
-#endif
-
 /**
  * of_attach_node - Plug a device node into the tree and global list.
  */
@@ -1880,22 +1844,9 @@ int of_attach_node(struct device_node *np)
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
         of_node_add(np);
-        of_add_proc_dt_entry(np);
         return 0;
 }
 
-#ifdef CONFIG_PROC_DEVICETREE
-static void of_remove_proc_dt_entry(struct device_node *dn)
-{
-        proc_remove(dn->pde);
-}
-#else
-static void of_remove_proc_dt_entry(struct device_node *dn)
-{
-        return;
-}
-#endif
-
 /**
  * of_detach_node - "Unplug" a node from the device tree.
  *
@@ -1951,7 +1902,6 @@ int of_detach_node(struct device_node *np)
         of_node_set_flag(np, OF_DETACHED);
         raw_spin_unlock_irqrestore(&devtree_lock, flags);
 
-        of_remove_proc_dt_entry(np);
         of_node_remove(np);
         return rc;
 }