Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index c6443de58fb0f29fd093497639ff82cac4085e5a..c76d16c972cc6cfaf6ce08fd56ebe89020508032 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -382,6 +382,7 @@ struct device_node *of_get_next_parent(struct device_node *node)
        raw_spin_unlock_irqrestore(&devtree_lock, flags);
        return parent;
 }
+EXPORT_SYMBOL(of_get_next_parent);
 
 /**
  *     of_get_next_child - Iterate a node childs
@@ -1493,16 +1494,7 @@ int of_attach_node(struct device_node *np)
 #ifdef CONFIG_PROC_DEVICETREE
 static void of_remove_proc_dt_entry(struct device_node *dn)
 {
-       struct device_node *parent = dn->parent;
-       struct property *prop = dn->properties;
-
-       while (prop) {
-               remove_proc_entry(prop->name, dn->pde);
-               prop = prop->next;
-       }
-
-       if (dn->pde)
-               remove_proc_entry(dn->pde->name, parent->pde);
+       proc_remove(dn->pde);
 }
 #else
 static void of_remove_proc_dt_entry(struct device_node *dn)