Merge remote-tracking branch 'agust/next' into next

[karo-tx-linux.git] / drivers / of / base.c

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 87b63850e8dcc2984724ffbc4f1c74cb8eec5147..fa40402fe8d5f4fe00979a4e813958e3b45b3f1a 100644 (file)
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1047,9 +1047,9 @@ static int of_property_notify(int action, struct device_node *np,
 #endif
 
 /**
- * prom_add_property - Add a property to a node
+ * of_add_property - Add a property to a node
  */
-int prom_add_property(struct device_node *np, struct property *prop)
+int of_add_property(struct device_node *np, struct property *prop)
 {
        struct property **next;
        unsigned long flags;
@@ -1083,14 +1083,14 @@ int prom_add_property(struct device_node *np, struct property *prop)
 }
 
 /**
- * prom_remove_property - Remove a property from a node.
+ * of_remove_property - Remove a property from a node.
  *
  * Note that we don't actually remove it, since we have given out
  * who-knows-how-many pointers to the data using get-property.
  * Instead we just move the property to the "dead properties"
  * list, so it won't be found any more.
  */
-int prom_remove_property(struct device_node *np, struct property *prop)
+int of_remove_property(struct device_node *np, struct property *prop)
 {
        struct property **next;
        unsigned long flags;
@@ -1129,7 +1129,7 @@ int prom_remove_property(struct device_node *np, struct property *prop)
 }
 
 /*
- * prom_update_property - Update a property in a node, if the property does
+ * of_update_property - Update a property in a node, if the property does
  * not exist, add it.
  *
  * Note that we don't actually remove it, since we have given out
@@ -1137,8 +1137,7 @@ int prom_remove_property(struct device_node *np, struct property *prop)
  * Instead we just move the property to the "dead properties" list,
  * and add the new property to the property list
  */
-int prom_update_property(struct device_node *np,
-                        struct property *newprop)
+int of_update_property(struct device_node *np, struct property *newprop)
 {
        struct property **next, *oldprop;
        unsigned long flags;
@@ -1153,7 +1152,7 @@ int prom_update_property(struct device_node *np,
 
        oldprop = of_find_property(np, newprop->name, NULL);
        if (!oldprop)
-               return prom_add_property(np, newprop);
+               return of_add_property(np, newprop);
 
        write_lock_irqsave(&devtree_lock, flags);
        next = &np->properties;
@@ -1198,11 +1197,13 @@ int of_reconfig_notifier_register(struct notifier_block *nb)
 {
        return blocking_notifier_chain_register(&of_reconfig_chain, nb);
 }
+EXPORT_SYMBOL_GPL(of_reconfig_notifier_register);
 
 int of_reconfig_notifier_unregister(struct notifier_block *nb)
 {
        return blocking_notifier_chain_unregister(&of_reconfig_chain, nb);
 }
+EXPORT_SYMBOL_GPL(of_reconfig_notifier_unregister);
 
 int of_reconfig_notify(unsigned long action, void *p)
 {