6 files changed, 29 insertions, 47 deletions

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 7995135170a3..ac01e188faef 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -194,7 +194,7 @@ static int pseries_update_drconf_memory(struct of_prop_reconfig *pr)
         if (!memblock_size)
                 return -EINVAL;
 
-        p = (u32 *)of_get_property(pr->dn, "ibm,dynamic-memory", NULL);
+        p = (u32 *) pr->old_prop->value;
         if (!p)
                 return -EINVAL;
 
diff --git a/drivers/crypto/nx/nx-842.c b/drivers/crypto/nx/nx-842.c
index 502edf0a2933..c897c3a5ee17 100644
--- a/drivers/crypto/nx/nx-842.c
+++ b/drivers/crypto/nx/nx-842.c
@@ -936,28 +936,14 @@ static int nx842_OF_upd(struct property *new_prop)
                 goto error_out;
         }
 
-        /* Set ptr to new property if provided */
-        if (new_prop) {
-                /* Single property */
-                if (!strncmp(new_prop->name, "status", new_prop->length)) {
-                        status = new_prop;
-
-                } else if (!strncmp(new_prop->name, "ibm,max-sg-len",
-                                        new_prop->length)) {
-                        maxsglen = new_prop;
-
-                } else if (!strncmp(new_prop->name, "ibm,max-sync-cop",
-                                        new_prop->length)) {
-                        maxsyncop = new_prop;
-
-                } else {
-                        /*
-                         * Skip the update, the property being updated
-                         * has no impact.
-                         */
-                        goto out;
-                }
-        }
+        /*
+         * If this is a property update, there are only certain properties that
+         * we care about. Bail if it isn't in the below list
+         */
+        if (new_prop && (strncmp(new_prop->name, "status", new_prop->length) ||
+                         strncmp(new_prop->name, "ibm,max-sg-len", new_prop->length) ||
+                         strncmp(new_prop->name, "ibm,max-sync-cop", new_prop->length)))
+                goto out;
 
         /* Perform property updates */
         ret = nx842_OF_upd_status(new_devdata, status);
diff --git a/drivers/of/base.c b/drivers/of/base.c
index ededf8e33145..a7ad1013edfa 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1674,10 +1674,6 @@ int of_add_property(struct device_node *np, struct property *prop)
         unsigned long flags;
         int rc;
 
-        rc = of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop);
-        if (rc)
-                return rc;
-
         mutex_lock(&of_mutex);
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
@@ -1689,6 +1685,9 @@ int of_add_property(struct device_node *np, struct property *prop)
 
         mutex_unlock(&of_mutex);
 
+        if (!rc)
+                of_property_notify(OF_RECONFIG_ADD_PROPERTY, np, prop, NULL);
+
         return rc;
 }
 
@@ -1731,10 +1730,6 @@ int of_remove_property(struct device_node *np, struct property *prop)
         unsigned long flags;
         int rc;
 
-        rc = of_property_notify(OF_RECONFIG_REMOVE_PROPERTY, np, prop);
-        if (rc)
-                return rc;
-
         mutex_lock(&of_mutex);
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
@@ -1746,6 +1741,9 @@ int of_remove_property(struct device_node *np, struct property *prop)
 
         mutex_unlock(&of_mutex);
 
+        if (!rc)
+                of_property_notify(OF_RECONFIG_REMOVE_PROPERTY, np, prop, NULL);
+
         return rc;
 }
 
@@ -1805,10 +1803,6 @@ int of_update_property(struct device_node *np, struct property *newprop)
         if (!newprop->name)
                 return -EINVAL;
 
-        rc = of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop);
-        if (rc)
-                return rc;
-
         mutex_lock(&of_mutex);
 
         raw_spin_lock_irqsave(&devtree_lock, flags);
@@ -1820,6 +1814,9 @@ int of_update_property(struct device_node *np, struct property *newprop)
 
         mutex_unlock(&of_mutex);
 
+        if (!rc)
+                of_property_notify(OF_RECONFIG_UPDATE_PROPERTY, np, newprop, oldprop);
+
         return rc;
 }
 
diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c
index 7c020b9a3317..7bd5501736a6 100644
--- a/drivers/of/dynamic.c
+++ b/drivers/of/dynamic.c
@@ -83,7 +83,7 @@ int of_reconfig_notify(unsigned long action, void *p)
 }
 
 int of_property_notify(int action, struct device_node *np,
-                       struct property *prop)
+                       struct property *prop, struct property *oldprop)
 {
         struct of_prop_reconfig pr;
 
@@ -93,6 +93,7 @@ int of_property_notify(int action, struct device_node *np,
 
         pr.dn = np;
         pr.prop = prop;
+        pr.old_prop = oldprop;
         return of_reconfig_notify(action, &pr);
 }
 
@@ -125,11 +126,6 @@ void __of_attach_node(struct device_node *np)
 int of_attach_node(struct device_node *np)
 {
         unsigned long flags;
-        int rc;
-
-        rc = of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, np);
-        if (rc)
-                return rc;
 
         mutex_lock(&of_mutex);
         raw_spin_lock_irqsave(&devtree_lock, flags);
@@ -138,6 +134,9 @@ int of_attach_node(struct device_node *np)
 
         __of_attach_node_sysfs(np);
         mutex_unlock(&of_mutex);
+
+        of_reconfig_notify(OF_RECONFIG_ATTACH_NODE, np);
+
         return 0;
 }
 
@@ -188,10 +187,6 @@ int of_detach_node(struct device_node *np)
         unsigned long flags;
         int rc = 0;
 
-        rc = of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
-        if (rc)
-                return rc;
-
         mutex_lock(&of_mutex);
         raw_spin_lock_irqsave(&devtree_lock, flags);
         __of_detach_node(np);
@@ -199,6 +194,9 @@ int of_detach_node(struct device_node *np)
 
         __of_detach_node_sysfs(np);
         mutex_unlock(&of_mutex);
+
+        of_reconfig_notify(OF_RECONFIG_DETACH_NODE, np);
+
         return rc;
 }
 
diff --git a/drivers/of/of_private.h b/drivers/of/of_private.h
index 8129c0e58d70..f69ccb1fa308 100644
--- a/drivers/of/of_private.h
+++ b/drivers/of/of_private.h
@@ -43,11 +43,11 @@ static inline struct device_node *kobj_to_device_node(struct kobject *kobj)
 
 #if defined(CONFIG_OF_DYNAMIC)
 extern int of_property_notify(int action, struct device_node *np,
-                              struct property *prop);
+                              struct property *prop, struct property *old_prop);
 extern void of_node_release(struct kobject *kobj);
 #else /* CONFIG_OF_DYNAMIC */
 static inline int of_property_notify(int action, struct device_node *np,
-                                     struct property *prop)
+                                     struct property *prop, struct property *old_prop)
 {
         return 0;
 }
diff --git a/include/linux/of.h b/include/linux/of.h
index 705fa12fca7f..400f18cb4fff 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -321,6 +321,7 @@ extern int of_update_property(struct device_node *np, struct property *newprop);
 struct of_prop_reconfig {
         struct device_node      *dn;
         struct property         *prop;
+        struct property         *old_prop;
 };
 
 extern int of_reconfig_notifier_register(struct notifier_block *);