powerpc+of: Rename the drivers/of prom_* functions to of_*

Rename the prom_*_property routines of the generic OF code to of_*_property.
This brings them in line with the naming used by the rest of the OF code.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Acked-by: Geoff Levand <geoff@infradead.org>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

5 files changed, 13 insertions, 13 deletions

diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 848a3e98e1c1..8fb12570b2f5 100644
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -539,7 +539,7 @@ static void __init p1022_ds_setup_arch(void)
                                 };
 
                                 /*
-                                 * prom_update_property() is called before
+                                 * of_update_property() is called before
                                  * kmalloc() is available, so the 'new' object
                                  * should be allocated in the global area.
                                  * The easiest way is to do that is to
@@ -548,7 +548,7 @@ static void __init p1022_ds_setup_arch(void)
                                  */
                                 pr_info("p1022ds: disabling %s node",
                                         np2->full_name);
-                                prom_update_property(np2, &nor_status);
+                                of_update_property(np2, &nor_status);
                                 of_node_put(np2);
                         }
 
@@ -564,7 +564,7 @@ static void __init p1022_ds_setup_arch(void)
 
                                 pr_info("p1022ds: disabling %s node",
                                         np2->full_name);
-                                prom_update_property(np2, &nand_status);
+                                of_update_property(np2, &nand_status);
                                 of_node_put(np2);
                         }
 
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 56d26bc4fd41..09787139834d 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -280,13 +280,13 @@ static void os_area_set_property(struct device_node *node,
 
         if (tmp) {
                 pr_debug("%s:%d found %s\n", __func__, __LINE__, prop->name);
-                prom_remove_property(node, tmp);
+                of_remove_property(node, tmp);
         }
 
-        result = prom_add_property(node, prop);
+        result = of_add_property(node, prop);
 
         if (result)
-                pr_debug("%s:%d prom_set_property failed\n", __func__,
+                pr_debug("%s:%d of_set_property failed\n", __func__,
                         __LINE__);
 }
 
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index da5594c441e4..e2685badb5db 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -760,7 +760,7 @@ static void remove_ddw(struct device_node *np)
         __remove_ddw(np, ddw_avail, liobn);
 
 delprop:
-        ret = prom_remove_property(np, win64);
+        ret = of_remove_property(np, win64);
         if (ret)
                 pr_warning("%s: failed to remove direct window property: %d\n",
                         np->full_name, ret);
@@ -1070,7 +1070,7 @@ static u64 enable_ddw(struct pci_dev *dev, struct device_node *pdn)
                 goto out_free_window;
         }
 
-        ret = prom_add_property(pdn, win64);
+        ret = of_add_property(pdn, win64);
         if (ret) {
                 dev_err(&dev->dev, "unable to add dma window property for %s: %d",
                          pdn->full_name, ret);
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index dd30b12edfe4..6573808cc5f3 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -116,7 +116,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
         }
 
         if (!more) {
-                prom_update_property(dn, new_prop);
+                of_update_property(dn, new_prop);
                 new_prop = NULL;
         }
 
@@ -172,7 +172,7 @@ static int update_dt_node(u32 phandle)
 
                         case 0x80000000:
                                 prop = of_find_property(dn, prop_name, NULL);
-                                prom_remove_property(dn, prop);
+                                of_remove_property(dn, prop);
                                 prop = NULL;
                                 break;
 
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 720a0cc2e69f..30b358dc2beb 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -326,7 +326,7 @@ static int do_add_property(char *buf, size_t bufsize)
         if (!prop)
                 return -ENOMEM;
 
-        prom_add_property(np, prop);
+        of_add_property(np, prop);
 
         return 0;
 }
@@ -350,7 +350,7 @@ static int do_remove_property(char *buf, size_t bufsize)
 
         prop = of_find_property(np, buf, NULL);
 
-        return prom_remove_property(np, prop);
+        return of_remove_property(np, prop);
 }
 
 static int do_update_property(char *buf, size_t bufsize)
@@ -380,7 +380,7 @@ static int do_update_property(char *buf, size_t bufsize)
         if (!strcmp(name, "slb-size") || !strcmp(name, "ibm,slb-size"))
                 slb_set_size(*(int *)value);
 
-        return prom_update_property(np, newprop);
+        return of_update_property(np, newprop);
 }
 
 /**