[POWERPC] Rename prom_n_size_cells to of_n_size_cells

This is more consistent and gets us closer to the Sparc code.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 5 insertions, 6 deletions

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 08d619756d33..2890ce3d6641 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -1056,8 +1056,7 @@ int of_n_addr_cells(struct device_node* np)
 }
 EXPORT_SYMBOL(of_n_addr_cells);
 
-int
-prom_n_size_cells(struct device_node* np)
+int of_n_size_cells(struct device_node* np)
 {
         const int* ip;
         do {
@@ -1070,7 +1069,7 @@ prom_n_size_cells(struct device_node* np)
         /* No #size-cells property for the root node, default to 1 */
         return 1;
 }
-EXPORT_SYMBOL(prom_n_size_cells);
+EXPORT_SYMBOL(of_n_size_cells);
 
 /**
  * Construct and return a list of the device_nodes with a given name.
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index e3d036fa6059..ba9c7c1e4108 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -70,7 +70,7 @@ static void of_bus_default_count_cells(struct device_node *dev,
         if (addrc)
                 *addrc = of_n_addr_cells(dev);
         if (sizec)
-                *sizec = prom_n_size_cells(dev);
+                *sizec = of_n_size_cells(dev);
 }
 
 static u64 of_bus_default_map(u32 *addr, const u32 *range,
@@ -660,7 +660,7 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
         dma_window += cells;
 
         prop = get_property(dn, "ibm,#dma-size-cells", NULL);
-        cells = prop ? *(u32 *)prop : prom_n_size_cells(dn);
+        cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
         *size = of_read_number(dma_window, cells);
 }
 
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index f7ef5a97c0ea..640ff0d8f83c 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -380,7 +380,7 @@ void __init smp_setup_cpu_maps(void)
                 const unsigned int *ireg;
 
                 num_addr_cell = of_n_addr_cells(dn);
-                num_size_cell = prom_n_size_cells(dn);
+                num_size_cell = of_n_size_cells(dn);
 
                 ireg = get_property(dn, "ibm,lrdr-capacity", NULL);