[POWERPC] Rename get_property to of_get_property: arch/powerpc

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 16 insertions, 14 deletions

diff --git a/arch/powerpc/platforms/chrp/nvram.c b/arch/powerpc/platforms/chrp/nvram.c
index 0dd4a64757d9..8efd4244701c 100644
--- a/arch/powerpc/platforms/chrp/nvram.c
+++ b/arch/powerpc/platforms/chrp/nvram.c
@@ -74,7 +74,7 @@ void __init chrp_nvram_init(void)
         if (nvram == NULL)
                 return;
 
-        nbytes_p = get_property(nvram, "#bytes", &proplen);
+        nbytes_p = of_get_property(nvram, "#bytes", &proplen);
         if (nbytes_p == NULL || proplen != sizeof(unsigned int))
                 return;
 
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index e2f870800e58..b23e39796a0b 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -217,7 +217,7 @@ chrp_find_bridges(void)
          * properties to adequately identify them, so we have to
          * look at what sort of machine this is as well.
          */
-        machine = get_property(root, "model", NULL);
+        machine = of_get_property(root, "model", NULL);
         if (machine != NULL) {
                 is_longtrail = strncmp(machine, "IBM,LongTrail", 13) == 0;
                 is_mot = strncmp(machine, "MOT", 3) == 0;
@@ -236,7 +236,7 @@ chrp_find_bridges(void)
                                dev->full_name);
                         continue;
                 }
-                bus_range = get_property(dev, "bus-range", &len);
+                bus_range = of_get_property(dev, "bus-range", &len);
                 if (bus_range == NULL || len < 2 * sizeof(int)) {
                         printk(KERN_WARNING "Can't get bus-range for %s\n",
                                 dev->full_name);
@@ -262,7 +262,7 @@ chrp_find_bridges(void)
                 hose->first_busno = bus_range[0];
                 hose->last_busno = bus_range[1];
 
-                model = get_property(dev, "model", NULL);
+                model = of_get_property(dev, "model", NULL);
                 if (model == NULL)
                         model = "<none>";
                 if (device_is_compatible(dev, "IBM,python")) {
@@ -284,7 +284,8 @@ chrp_find_bridges(void)
                                            r.start + 0x000f8000,
                                            r.start + 0x000f8010);
                         if (index == 0) {
-                                dma = get_property(dev, "system-dma-base",&len);
+                                dma = of_get_property(dev, "system-dma-base",
+                                                        &len);
                                 if (dma && len >= sizeof(*dma)) {
                                         dma = (unsigned int *)
                                                 (((unsigned long)dma) +
@@ -302,7 +303,7 @@ chrp_find_bridges(void)
 
                 /* check the first bridge for a property that we can
                    use to set pci_dram_offset */
-                dma = get_property(dev, "ibm,dma-ranges", &len);
+                dma = of_get_property(dev, "ibm,dma-ranges", &len);
                 if (index == 0 && dma != NULL && len >= 6 * sizeof(*dma)) {
                         pci_dram_offset = dma[2] - dma[3];
                         printk("pci_dram_offset = %lx\n", pci_dram_offset);
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 044ad3f1e04a..05d1bc0c8918 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -112,7 +112,7 @@ void chrp_show_cpuinfo(struct seq_file *m)
 
         root = find_path_device("/");
         if (root)
-                model = get_property(root, "model", NULL);
+                model = of_get_property(root, "model", NULL);
         seq_printf(m, "machine\t\t: CHRP %s\n", model);
 
         /* longtrail (goldengate) stuff */
@@ -205,7 +205,8 @@ static void __init sio_init(void)
         struct device_node *root;
 
         if ((root = find_path_device("/")) &&
-            !strncmp(get_property(root, "model", NULL), "IBM,LongTrail", 13)) {
+            !strncmp(of_get_property(root, "model", NULL),
+                        "IBM,LongTrail", 13)) {
                 /* logical device 0 (KBC/Keyboard) */
                 sio_fixup_irq("keyboard", 0, 1, 2);
                 /* select logical device 1 (KBC/Mouse) */
@@ -225,7 +226,7 @@ static void __init pegasos_set_l2cr(void)
         /* Enable L2 cache if needed */
         np = find_type_devices("cpu");
         if (np != NULL) {
-                const unsigned int *l2cr = get_property(np, "l2cr", NULL);
+                const unsigned int *l2cr = of_get_property(np, "l2cr", NULL);
                 if (l2cr == NULL) {
                         printk ("Pegasos l2cr : no cpu l2cr property found\n");
                         return;
@@ -256,7 +257,7 @@ void __init chrp_setup_arch(void)
         loops_per_jiffy = 50000000/HZ;
 
         if (root)
-                machine = get_property(root, "model", NULL);
+                machine = of_get_property(root, "model", NULL);
         if (machine && strncmp(machine, "Pegasos", 7) == 0) {
                 _chrp_type = _CHRP_Pegasos;
         } else if (machine && strncmp(machine, "IBM", 3) == 0) {
@@ -360,7 +361,7 @@ static void __init chrp_find_openpic(void)
                 return;
         root = of_find_node_by_path("/");
         if (root) {
-                opprop = get_property(root, "platform-open-pic", &oplen);
+                opprop = of_get_property(root, "platform-open-pic", &oplen);
                 na = of_n_addr_cells(root);
         }
         if (opprop && oplen >= na * sizeof(unsigned int)) {
@@ -377,7 +378,7 @@ static void __init chrp_find_openpic(void)
 
         printk(KERN_INFO "OpenPIC at %lx\n", opaddr);
 
-        iranges = get_property(np, "interrupt-ranges", &len);
+        iranges = of_get_property(np, "interrupt-ranges", &len);
         if (iranges == NULL)
                 len = 0;        /* non-distributed mpic */
         else
@@ -463,7 +464,7 @@ static void __init chrp_find_8259(void)
          * from anyway
          */
         for (np = find_devices("pci"); np != NULL; np = np->next) {
-                const unsigned int *addrp = get_property(np,
+                const unsigned int *addrp = of_get_property(np,
                                 "8259-interrupt-acknowledge", NULL);
 
                 if (addrp == NULL)
@@ -543,7 +544,7 @@ chrp_init2(void)
          */
         device = find_devices("rtas");
         if (device)
-                p = get_property(device, "rtas-event-scan-rate", NULL);
+                p = of_get_property(device, "rtas-event-scan-rate", NULL);
         if (p && *p) {
                 /*
                  * Arrange to call chrp_event_scan at least *p times