50 files changed, 120 insertions, 122 deletions

diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
index 3e5621102d5f..b121195cc598 100644
--- a/drivers/ata/sata_svw.c
+++ b/drivers/ata/sata_svw.c
@@ -297,7 +297,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
         /* Match it to a port node */
         index = (ap == ap->host->ports[0]) ? 0 : 1;
         for (np = np->child; np != NULL; np = np->sibling) {
-                const u32 *reg = of_get_property(np, "reg", NULL);
+                const u32 *reg = get_property(np, "reg", NULL);
                 if (!reg)
                         continue;
                 if (index == *reg)
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 42c0a600b1ac..91b062126a68 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -613,7 +613,7 @@ static int __devinit agp_uninorth_probe(struct pci_dev *pdev,
                 uninorth_node = of_find_node_by_name(NULL, "u3");
         }
         if (uninorth_node) {
-                const int *revprop = of_get_property(uninorth_node,
+                const int *revprop = get_property(uninorth_node,
                                 "device-rev", NULL);
                 if (revprop != NULL)
                         uninorth_rev = *revprop & 0x3f;
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
index ed53f541d9e8..c70d52ace8b2 100644
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
@@ -206,7 +206,7 @@ static int __init briq_panel_init(void)
         const char *machine;
         int i;
 
-        machine = of_get_property(root, "model", NULL);
+        machine = get_property(root, "model", NULL);
         if (!machine || strncmp(machine, "TotalImpact,BRIQ-1", 18) != 0) {
                 of_node_put(root);
                 return -ENODEV;
diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index ec420fe8a908..f144a947bd17 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -575,7 +575,7 @@ static int hvc_find_vtys(void)
                                 (num_found >= VTTY_PORTS))
                         break;
 
-                vtermno = of_get_property(vty, "reg", NULL);
+                vtermno = get_property(vty, "reg", NULL);
                 if (!vtermno)
                         continue;
 
diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
index 94a542e20efb..f9c00844d2bf 100644
--- a/drivers/char/hvc_vio.c
+++ b/drivers/char/hvc_vio.c
@@ -153,7 +153,7 @@ static int hvc_find_vtys(void)
                 if (num_found >= MAX_NR_HVC_CONSOLES)
                         break;
 
-                vtermno = of_get_property(vty, "reg", NULL);
+                vtermno = get_property(vty, "reg", NULL);
                 if (!vtermno)
                         continue;
 
diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d5a752da322f..50315d6364fd 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -1279,8 +1279,8 @@ static int __init hvsi_console_init(void)
                 struct hvsi_struct *hp;
                 const uint32_t *vtermno, *irq;
 
-                vtermno = of_get_property(vty, "reg", NULL);
-                irq = of_get_property(vty, "interrupts", NULL);
+                vtermno = get_property(vty, "reg", NULL);
+                irq = get_property(vty, "interrupts", NULL);
                 if (!vtermno || !irq)
                         continue;
 
diff --git a/drivers/char/tpm/tpm_atmel.h b/drivers/char/tpm/tpm_atmel.h
index 377bc6077c6f..3c852009196e 100644
--- a/drivers/char/tpm/tpm_atmel.h
+++ b/drivers/char/tpm/tpm_atmel.h
@@ -52,7 +52,7 @@ static void __iomem * atmel_get_base_addr(unsigned long *base, int *region_size)
                 return NULL;
         }
 
-        reg = of_get_property(dn, "reg", &reglen);
+        reg = get_property(dn, "reg", &reglen);
         naddrc = of_n_addr_cells(dn);
         nsizec = of_n_size_cells(dn);
 
diff --git a/drivers/hwmon/ams/ams-core.c b/drivers/hwmon/ams/ams-core.c
index 93b963fd1293..f5ebad561412 100644
--- a/drivers/hwmon/ams/ams-core.c
+++ b/drivers/hwmon/ams/ams-core.c
@@ -144,7 +144,7 @@ int ams_sensor_attach(void)
         const u32 *prop;
 
         /* Get orientation */
-        prop = of_get_property(ams_info.of_node, "orientation", NULL);
+        prop = get_property(ams_info.of_node, "orientation", NULL);
         if (!prop)
                 return -ENODEV;
         ams_info.orient1 = *prop;
diff --git a/drivers/hwmon/ams/ams-i2c.c b/drivers/hwmon/ams/ams-i2c.c
index ccd5cefae90e..485d333bcb3e 100644
--- a/drivers/hwmon/ams/ams-i2c.c
+++ b/drivers/hwmon/ams/ams-i2c.c
@@ -276,7 +276,7 @@ int __init ams_i2c_init(struct device_node *np)
         ams_info.bustype = BUS_I2C;
 
         /* look for bus either using "reg" or by path */
-        prop = of_get_property(ams_info.of_node, "reg", NULL);
+        prop = get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
 
diff --git a/drivers/hwmon/ams/ams-pmu.c b/drivers/hwmon/ams/ams-pmu.c
index 9463e9768f6f..1b01c215bfe7 100644
--- a/drivers/hwmon/ams/ams-pmu.c
+++ b/drivers/hwmon/ams/ams-pmu.c
@@ -160,7 +160,7 @@ int __init ams_pmu_init(struct device_node *np)
         ams_info.bustype = BUS_HOST;
 
         /* Get PMU command, should be 0x4e, but we can never know */
-        prop = of_get_property(ams_info.of_node, "reg", NULL);
+        prop = get_property(ams_info.of_node, "reg", NULL);
         if (!prop) {
                 result = -ENODEV;
                 goto exit;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 774bfd39a599..071a030ec26e 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -1175,14 +1175,14 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
                 pmif->broken_dma = 1;
         }
 
-        bidp = of_get_property(np, "AAPL,bus-id", NULL);
+        bidp = get_property(np, "AAPL,bus-id", NULL);
         pmif->aapl_bus_id =  bidp ? *bidp : 0;
 
         /* Get cable type from device-tree */
         if (pmif->kind == controller_kl_ata4 || pmif->kind == controller_un_ata6
             || pmif->kind == controller_k2_ata6
             || pmif->kind == controller_sh_ata6) {
-                const char* cable = of_get_property(np, "cable-type", NULL);
+                const char* cable = get_property(np, "cable-type", NULL);
                 if (cable && !strncmp(cable, "80-", 3))
                         pmif->cable_80 = 1;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index e5c2bcc26259..cee66b79b30d 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -569,7 +569,7 @@ static int __devinit ehca_probe(struct ibmebus_dev *dev,
         struct ib_pd *ibpd;
         int ret;
 
-        handle = of_get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
+        handle = get_property(dev->ofdev.node, "ibm,hca-handle", NULL);
         if (!handle) {
                 ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
                              dev->ofdev.node->full_name);
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index c96b7fe882a4..e851266a2db1 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -395,7 +395,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
 #endif
                         MAX_NODE_NAME_SIZE, np->name);
         } else {
-                reg = of_get_property(np, "reg", NULL);
+                reg = get_property(np, "reg", NULL);
                 sprintf(dev->ofdev.dev.bus_id, "%1d.%08x:%.*s",
                         chip->lbus.index,
                         reg ? *reg : 0, MAX_NODE_NAME_SIZE, np->name);
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index cc8267912656..0a5647fb8569 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -21,7 +21,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
         int length = 0;
 
         of = &to_macio_device (dev)->ofdev;
-        compat = of_get_property(of->node, "compatible", &cplen);
+        compat = get_property(of->node, "compatible", &cplen);
         if (!compat) {
                 *buf = '\0';
                 return 0;
@@ -47,7 +47,7 @@ static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
         int length;
 
         of = &to_macio_device (dev)->ofdev;
-        compat = of_get_property(of->node, "compatible", &cplen);
+        compat = get_property(of->node, "compatible", &cplen);
         if (!compat) compat = "", cplen = 1;
         length = sprintf (buf, "of:N%sT%s", of->node->name, of->node->type);
         buf += length;
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 4177ff004753..f83fad2a3ff4 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -387,7 +387,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
                if (strcmp(np->name, "lightshow") == 0)
                        break;
                if ((strcmp(np->name, "sound") == 0) &&
-                   of_get_property(np, "virtual", NULL) != NULL)
+                   get_property(np, "virtual", NULL) != NULL)
                        break;
         }
         if (np == NULL) {
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 135f22eb1ad4..45bb3c1dfeb1 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -491,7 +491,7 @@ int __init smu_init (void)
                 printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
                 goto fail;
         }
-        data = of_get_property(smu->db_node, "reg", NULL);
+        data = get_property(smu->db_node, "reg", NULL);
         if (data == NULL) {
                 of_node_put(smu->db_node);
                 smu->db_node = NULL;
@@ -512,7 +512,7 @@ int __init smu_init (void)
                 smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
                 if (smu->msg_node == NULL)
                         break;
-                data = of_get_property(smu->msg_node, "reg", NULL);
+                data = get_property(smu->msg_node, "reg", NULL);
                 if (data == NULL) {
                         of_node_put(smu->msg_node);
                         smu->msg_node = NULL;
@@ -1004,7 +1004,7 @@ const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
         } else
                 mutex_lock(&smu_part_access);
 
-        part = of_get_property(smu->of_node, pname, size);
+        part = get_property(smu->of_node, pname, size);
         if (part == NULL) {
                 DPRINTK("trying to extract from SMU ...\n");
                 part = smu_create_sdb_partition(id);
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 228903403cfc..a7ce55926638 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -567,13 +567,13 @@ thermostat_init(void)
         else
                 return -ENODEV;
 
-        prop = of_get_property(np, "hwsensor-params-version", NULL);
+        prop = get_property(np, "hwsensor-params-version", NULL);
         printk(KERN_INFO "adt746x: version %d (%ssupported)\n", *prop,
                          (*prop == 1)?"":"un");
         if (*prop != 1)
                 return -ENODEV;
 
-        prop = of_get_property(np, "reg", NULL);
+        prop = get_property(np, "reg", NULL);
         if (!prop)
                 return -ENODEV;
 
@@ -591,9 +591,9 @@ thermostat_init(void)
                          "limit_adjust: %d, fan_speed: %d\n",
                          therm_bus, therm_address, limit_adjust, fan_speed);
 
-        if (of_get_property(np, "hwsensor-location", NULL)) {
+        if (get_property(np, "hwsensor-location", NULL)) {
                 for (i = 0; i < 3; i++) {
-                        sensor_location[i] = of_get_property(np,
+                        sensor_location[i] = get_property(np,
                                         "hwsensor-location", NULL) + offset;
 
                         if (sensor_location[i] == NULL)
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 78ff18617139..2e4ad44a8636 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -674,7 +674,7 @@ static int read_eeprom(int cpu, struct mpu_data *out)
                 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid node from device-tree\n");
                 return -ENODEV;
         }
-        data = of_get_property(np, "cpuid", &len);
+        data = get_property(np, "cpuid", &len);
         if (data == NULL) {
                 printk(KERN_ERR "therm_pm72: Failed to retrieve cpuid property from device-tree\n");
                 of_node_put(np);
@@ -1337,7 +1337,7 @@ static int init_backside_state(struct backside_pid_state *state)
          */
         u3 = of_find_node_by_path("/u3@0,f8000000");
         if (u3 != NULL) {
-                const u32 *vers = of_get_property(u3, "device-rev", NULL);
+                const u32 *vers = get_property(u3, "device-rev", NULL);
                 if (vers)
                         if (((*vers) & 0x3f) < 0x34)
                                 u3h = 0;
@@ -2129,8 +2129,8 @@ static void fcu_lookup_fans(struct device_node *fcu_node)
                         continue;
 
                 /* Lookup for a matching location */
-                loc = of_get_property(np, "location", NULL);
-                reg = of_get_property(np, "reg", NULL);
+                loc = get_property(np, "location", NULL);
+                reg = get_property(np, "reg", NULL);
                 if (loc == NULL || reg == NULL)
                         continue;
                 DBG(" matching location: %s, reg: 0x%08x\n", loc, *reg);
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 35233de460ad..a1d3a987cb3a 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -492,7 +492,7 @@ g4fan_init( void )
 
         if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
                 return -ENODEV;
-        info = of_get_property(np, "thermal-info", NULL);
+        info = get_property(np, "thermal-info", NULL);
         of_node_put(np);
 
         if( !info || !machine_is_compatible("PowerMac3,6") )
diff --git a/drivers/macintosh/via-cuda.c b/drivers/macintosh/via-cuda.c
index 76d21775fc35..d58fcf6cca0a 100644
--- a/drivers/macintosh/via-cuda.c
+++ b/drivers/macintosh/via-cuda.c
@@ -131,7 +131,7 @@ int __init find_via_cuda(void)
     if (vias == 0)
         return 0;
 
-    reg = of_get_property(vias, "reg", NULL);
+    reg = get_property(vias, "reg", NULL);
     if (reg == NULL) {
             printk(KERN_ERR "via-cuda: No \"reg\" property !\n");
             goto fail;
diff --git a/drivers/macintosh/via-pmu-led.c b/drivers/macintosh/via-pmu-led.c
index fc89a7047cd0..f8d7a460c9a8 100644
--- a/drivers/macintosh/via-pmu-led.c
+++ b/drivers/macintosh/via-pmu-led.c
@@ -118,7 +118,7 @@ static int __init via_pmu_led_init(void)
         dt = of_find_node_by_path("/");
         if (dt == NULL)
                 return -ENODEV;
-        model = of_get_property(dt, "model", NULL);
+        model = get_property(dt, "model", NULL);
         if (model == NULL)
                 return -ENODEV;
         if (strncmp(model, "PowerBook", strlen("PowerBook")) != 0 &&
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 1729d3fd7a11..8470210db7f6 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -289,7 +289,7 @@ int __init find_via_pmu(void)
         if (vias == NULL)
                 return 0;
 
-        reg = of_get_property(vias, "reg", NULL);
+        reg = get_property(vias, "reg", NULL);
         if (reg == NULL) {
                 printk(KERN_ERR "via-pmu: No \"reg\" property !\n");
                 goto fail;
@@ -334,7 +334,7 @@ int __init find_via_pmu(void)
                 
                 gpiop = of_find_node_by_name(NULL, "gpio");
                 if (gpiop) {
-                        reg = of_get_property(gpiop, "reg", NULL);
+                        reg = get_property(gpiop, "reg", NULL);
                         if (reg)
                                 gaddr = of_translate_address(gpiop, reg);
                         if (gaddr != OF_BAD_ADDR)
@@ -491,7 +491,7 @@ static int __init via_pmu_dev_init(void)
                         of_find_node_by_name(NULL, "power-mgt");
                 const u32 *prim_info = NULL;
                 if (prim)
-                        prim_info = of_get_property(prim, "prim-info", NULL);
+                        prim_info = get_property(prim, "prim-info", NULL);
                 if (prim_info) {
                         /* Other stuffs here yet unknown */
                         pmu_battery_count = (prim_info[6] >> 16) & 0xff;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index ab4d1b63f63e..3f7967feaf5b 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -176,7 +176,7 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
         for (dev = NULL;
              (dev = of_get_next_child(busnode, dev)) != NULL;) {
                 const char *loc =
-                        of_get_property(dev, "hwsensor-location", NULL);
+                        get_property(dev, "hwsensor-location", NULL);
                 u8 addr;
 
                 /* We must re-match the adapter in order to properly check
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index eaa74afa175b..eae1189d6c41 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -134,7 +134,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
                 if (!device_is_compatible(dev, "max6690"))
                         continue;
                 addr = pmac_i2c_get_dev_addr(dev);
-                loc = of_get_property(dev, "hwsensor-location", NULL);
+                loc = get_property(dev, "hwsensor-location", NULL);
                 if (loc == NULL || addr == 0)
                         continue;
                 printk("found max6690, loc=%s addr=0x%02x\n", loc, addr);
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index ff398adc0283..31b750d61206 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -167,7 +167,7 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
         if (fct == NULL)
                 return NULL;
         fct->ctrl.ops = &smu_fan_ops;
-        l = of_get_property(node, "location", NULL);
+        l = get_property(node, "location", NULL);
         if (l == NULL)
                 goto fail;
 
@@ -224,17 +224,17 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
                 goto fail;
 
         /* Get min & max values*/
-        v = of_get_property(node, "min-value", NULL);
+        v = get_property(node, "min-value", NULL);
         if (v == NULL)
                 goto fail;
         fct->min = *v;
-        v = of_get_property(node, "max-value", NULL);
+        v = get_property(node, "max-value", NULL);
         if (v == NULL)
                 goto fail;
         fct->max = *v;
 
         /* Get "reg" value */
-        reg = of_get_property(node, "reg", NULL);
+        reg = get_property(node, "reg", NULL);
         if (reg == NULL)
                 goto fail;
         fct->reg = *reg;
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 9a6c2cf8fd0e..83f79de7174b 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -241,7 +241,7 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
         char *name;
         int vsens[2], isens[2];
 
-        reg = of_get_property(dev, "reg", NULL);
+        reg = get_property(dev, "reg", NULL);
         if (reg == NULL)
                 return;
         addr = *reg;
@@ -268,9 +268,9 @@ static void wf_sat_create(struct i2c_adapter *adapter, struct device_node *dev)
         isens[0] = isens[1] = -1;
         child = NULL;
         while ((child = of_get_next_child(dev, child)) != NULL) {
-                reg = of_get_property(child, "reg", NULL);
-                type = of_get_property(child, "device_type", NULL);
-                loc = of_get_property(child, "location", NULL);
+                reg = get_property(child, "reg", NULL);
+                type = get_property(child, "device_type", NULL);
+                loc = get_property(child, "location", NULL);
                 if (reg == NULL || loc == NULL)
                         continue;
 
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c
index 9c567b93f417..01b4c50143dd 100644
--- a/drivers/macintosh/windfarm_smu_sensors.c
+++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -204,8 +204,8 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
         ads = kmalloc(sizeof(struct smu_ad_sensor), GFP_KERNEL);
         if (ads == NULL)
                 return NULL;
-        c = of_get_property(node, "device_type", NULL);
-        l = of_get_property(node, "location", NULL);
+        c = get_property(node, "device_type", NULL);
+        l = get_property(node, "location", NULL);
         if (c == NULL || l == NULL)
                 goto fail;
 
@@ -255,7 +255,7 @@ static struct smu_ad_sensor *smu_ads_create(struct device_node *node)
         } else
                 goto fail;
 
-        v = of_get_property(node, "reg", NULL);
+        v = get_property(node, "reg", NULL);
         if (v == NULL)
                 goto fail;
         ads->reg = *v;
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 72107dc06d67..7efe744ad31e 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -48,7 +48,7 @@ static int parse_flash_partitions(struct device_node *node,
         const  u32  *part;
         const  char *name;
 
-        part = of_get_property(node, "partitions", &plen);
+        part = get_property(node, "partitions", &plen);
         if (part == NULL)
                 goto err;
 
@@ -59,7 +59,7 @@ static int parse_flash_partitions(struct device_node *node,
                 goto err;
         }
 
-        name = of_get_property(node, "partition-names", &plen);
+        name = get_property(node, "partition-names", &plen);
 
         for (i = 0; i < retval; i++) {
                 (*parts)[i].offset = *part++;
@@ -153,7 +153,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
                 goto err_out;
         }
 
-        width = of_get_property(dp, "bank-width", NULL);
+        width = get_property(dp, "bank-width", NULL);
         if (width == NULL) {
                 dev_err(&dev->dev, "Can't get the flash bank width!\n");
                 err = -EINVAL;
@@ -174,7 +174,7 @@ static int __devinit of_physmap_probe(struct of_device *dev, const struct of_dev
 
         simple_map_init(&info->map);
 
-        of_probe = of_get_property(dp, "probe-type", NULL);
+        of_probe = get_property(dp, "probe-type", NULL);
         if (of_probe == NULL) {
                 probe_type = rom_probe_types;
                 for (; info->mtd == NULL && *probe_type != NULL; probe_type++)
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index aa01ba347fed..c143304dcff5 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1261,10 +1261,9 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
                 return -ENODEV;
         }
-        prop_addr = of_get_property(macio_get_of_node(mdev),
-                        "mac-address", NULL);
+        prop_addr = get_property(macio_get_of_node(mdev), "mac-address", NULL);
         if (prop_addr == NULL) {
-                prop_addr = of_get_property(macio_get_of_node(mdev),
+                prop_addr = get_property(macio_get_of_node(mdev),
                                 "local-mac-address", NULL);
                 if (prop_addr == NULL) {
                         printk(KERN_ERR "BMAC: Can't get mac-address\n");
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 6d5effd89897..d1a8134c8e31 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -2336,7 +2336,7 @@ static int ehea_setup_single_port(struct ehea_port *port,
         port->of_dev_node = dn;
 
         /* Determine logical port id */
-        dn_log_port_id = of_get_property(dn, "ibm,hea-port-no", NULL);
+        dn_log_port_id = get_property(dn, "ibm,hea-port-no", NULL);
 
         if (!dn_log_port_id) {
                 ehea_error("bad device node: dn_log_port_id=%p",
@@ -2502,7 +2502,7 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
                 goto out;
         }
 
-        adapter_handle = of_get_property(dev->ofdev.node, "ibm,hea-handle",
+        adapter_handle = get_property(dev->ofdev.node, "ibm,hea-handle",
                                             NULL);
         if (adapter_handle)
                 adapter->handle = *adapter_handle;
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 7018ba92ce8f..9ec24f0d5d68 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -110,9 +110,9 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                 return -ENODEV;
         }
 
-        addr = of_get_property(mace, "mac-address", NULL);
+        addr = get_property(mace, "mac-address", NULL);
         if (addr == NULL) {
-                addr = of_get_property(mace, "local-mac-address", NULL);
+                addr = get_property(mace, "local-mac-address", NULL);
                 if (addr == NULL) {
                         printk(KERN_ERR "Can't get mac-address for MACE %s\n",
                                mace->full_name);
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index cb7a8e7729a2..d670ac74824f 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -80,7 +80,7 @@ static int pasemi_get_mac_addr(struct pasemi_mac *mac)
                 return -ENOENT;
         }
 
-        maddr = of_get_property(dn, "mac-address", NULL);
+        maddr = get_property(dn, "mac-address", NULL);
         if (maddr == NULL) {
                 dev_warn(&pdev->dev,
                          "no mac address in device tree, not configuring\n");
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 698476154d81..3b91af89e4c7 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1831,7 +1831,7 @@ try_host_fw:
         if (!dn)
                 goto out_err;
 
-        fw_prop = of_get_property(dn, "firmware", &fw_size);
+        fw_prop = get_property(dn, "firmware", &fw_size);
         if (!fw_prop)
                 goto out_err;
 
@@ -2237,7 +2237,7 @@ spider_net_setup_netdev(struct spider_net_card *card)
         if (!dn)
                 return -EIO;
 
-        mac = of_get_property(dn, "local-mac-address", NULL);
+        mac = get_property(dn, "local-mac-address", NULL);
         if (!mac)
                 return -EIO;
         memcpy(addr.sa_data, mac, ETH_ALEN);
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 6b1cd745af08..08ea61db46fe 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2929,7 +2929,7 @@ static int __devinit gem_get_device_address(struct gem *gp)
 #elif defined(CONFIG_PPC_PMAC)
         const unsigned char *addr;
 
-        addr = of_get_property(gp->of_node, "local-mac-address", NULL);
+        addr = get_property(gp->of_node, "local-mac-address", NULL);
         if (addr == NULL) {
                 printk("\n");
                 printk(KERN_ERR "%s: can't get mac-address\n", dev->name);
diff --git a/drivers/net/sungem_phy.c b/drivers/net/sungem_phy.c
index 61843fd57525..56a110ca5e6f 100644
--- a/drivers/net/sungem_phy.c
+++ b/drivers/net/sungem_phy.c
@@ -451,7 +451,7 @@ static int bcm5421_init(struct mii_phy* phy)
         if (phy->platform_data) {
                 struct device_node *np = of_get_parent(phy->platform_data);
                 int can_low_power = 1;
-                if (np == NULL || of_get_property(np, "no-autolowpower", NULL))
+                if (np == NULL || get_property(np, "no-autolowpower", NULL))
                         can_low_power = 0;
                 if (can_low_power) {
                         /* Enable automatic low-power */
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 12d394ffade7..639e1e6913bf 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -4080,16 +4080,16 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
-        prop = of_get_property(np, "device-id", NULL);
+        prop = get_property(np, "device-id", NULL);
         ucc_num = *prop - 1;
         if ((ucc_num < 0) || (ucc_num > 7))
                 return -ENODEV;
 
         ug_info = &ugeth_info[ucc_num];
         ug_info->uf_info.ucc_num = ucc_num;
-        prop = of_get_property(np, "rx-clock", NULL);
+        prop = get_property(np, "rx-clock", NULL);
         ug_info->uf_info.rx_clock = *prop;
-        prop = of_get_property(np, "tx-clock", NULL);
+        prop = get_property(np, "tx-clock", NULL);
         ug_info->uf_info.tx_clock = *prop;
         err = of_address_to_resource(np, 0, &res);
         if (err)
@@ -4098,15 +4098,15 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         ug_info->uf_info.regs = res.start;
         ug_info->uf_info.irq = irq_of_parse_and_map(np, 0);
 
-        ph = of_get_property(np, "phy-handle", NULL);
+        ph = get_property(np, "phy-handle", NULL);
         phy = of_find_node_by_phandle(*ph);
 
         if (phy == NULL)
                 return -ENODEV;
 
-        prop = of_get_property(phy, "reg", NULL);
+        prop = get_property(phy, "reg", NULL);
         ug_info->phy_address = *prop;
-        prop = of_get_property(phy, "interface", NULL);
+        prop = get_property(phy, "interface", NULL);
         ug_info->enet_interface = *prop;
         ug_info->phy_interrupt = irq_of_parse_and_map(phy, 0);
         ug_info->board_flags = (ug_info->phy_interrupt == NO_IRQ)?
@@ -4127,7 +4127,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         /* timing.                                              */
         /* The following compensates by writing to the reserved */
         /* QE Port Output Hold Registers (CPOH1?).              */
-        prop = of_get_property(phy, "interface", NULL);
+        prop = get_property(phy, "interface", NULL);
         phy_interface = *prop;
         if ((phy_interface == ENET_1000_RGMII) ||
                         (phy_interface == ENET_100_RGMII) ||
@@ -4140,7 +4140,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
                 soc = of_find_node_by_type(NULL, "soc");
                 if (soc) {
                         unsigned int size;
-                        const void *prop = of_get_property(soc, "reg", &size);
+                        const void *prop = get_property(soc, "reg", &size);
                         immrbase = of_translate_address(soc, prop);
                         of_node_put(soc);
                 };
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index 353da5b296ef..71a2cb8baa4a 100644
--- a/drivers/pci/hotplug/rpaphp_core.c
+++ b/drivers/pci/hotplug/rpaphp_core.c
@@ -182,10 +182,10 @@ static int get_children_props(struct device_node *dn, const int **drc_indexes,
 {
         const int *indexes, *names, *types, *domains;
 
-        indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
-        names = of_get_property(dn, "ibm,drc-names", NULL);
-        types = of_get_property(dn, "ibm,drc-types", NULL);
-        domains = of_get_property(dn, "ibm,drc-power-domains", NULL);
+        indexes = get_property(dn, "ibm,drc-indexes", NULL);
+        names = get_property(dn, "ibm,drc-names", NULL);
+        types = get_property(dn, "ibm,drc-types", NULL);
+        domains = get_property(dn, "ibm,drc-power-domains", NULL);
 
         if (!indexes || !names || !types || !domains) {
                 /* Slot does not have dynamically-removable children */
@@ -218,7 +218,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
         char *name_tmp, *type_tmp;
         int i, rc;
 
-        my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
+        my_index = get_property(dn, "ibm,my-drc-index", NULL);
         if (!my_index) {
                 /* Node isn't DLPAR/hotplug capable */
                 return -EINVAL;
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 140dd9700ff6..a39a478bb39a 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -903,16 +903,16 @@ static int get_system_info(void)
         if (!rootdn)
                 return -ENOENT;
 
-        model = of_get_property(rootdn, "model", NULL);
-        id = of_get_property(rootdn, "system-id", NULL);
+        model = get_property(rootdn, "model", NULL);
+        id = get_property(rootdn, "system-id", NULL);
         if (model && id)
                 snprintf(system_id, sizeof(system_id), "%s-%s", model, id);
 
-        name = of_get_property(rootdn, "ibm,partition-name", NULL);
+        name = get_property(rootdn, "ibm,partition-name", NULL);
         if (name)
                 strncpy(partition_name, name, sizeof(partition_name));
 
-        num = of_get_property(rootdn, "ibm,partition-no", NULL);
+        num = get_property(rootdn, "ibm,partition-no", NULL);
         if (num)
                 partition_number = *num;
 
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index d8700aaa6114..0a533f398f52 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -162,11 +162,11 @@ static void gather_partition_info(void)
                 return;
         }
 
-        ppartition_name = of_get_property(rootdn, "ibm,partition-name", NULL);
+        ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
         if (ppartition_name)
                 strncpy(partition_name, ppartition_name,
                                 sizeof(partition_name));
-        p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL);
+        p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
         if (p_number_ptr)
                 partition_number = *p_number_ptr;
         of_node_put(rootdn);
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 5806ede120a4..753d88306cd1 100644
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -471,7 +471,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
                 goto out_free;
         }
 
-        clkprop = of_get_property(node, "clock-frequency", &proplen);
+        clkprop = get_property(node, "clock-frequency", &proplen);
         if (clkprop == NULL || proplen != sizeof(int)) {
                 printk(KERN_ERR "%s: can't get clock frequency, "
                        "assuming 25MHz\n", node->full_name);
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c
index cf3666d7d97a..1fd3c7590d31 100644
--- a/drivers/scsi/mesh.c
+++ b/drivers/scsi/mesh.c
@@ -1947,7 +1947,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match)
                 ms->tgts[tgt].current_req = NULL;
         }
 
-        if ((cfp = of_get_property(mesh, "clock-frequency", NULL)))
+        if ((cfp = get_property(mesh, "clock-frequency", NULL)))
                 ms->clk_freq = *cfp;
         else {
                 printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n");
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index f8c1761eb57f..8d24cd521056 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1069,7 +1069,7 @@ mpc52xx_uart_of_enumerate(void)
                         continue;
 
                 /* Is a particular device number requested? */
-                devno = of_get_property(np, "port-number", NULL);
+                devno = get_property(np, "port-number", NULL);
                 mpc52xx_uart_of_assign(of_node_get(np), devno ? *devno : -1);
         }
 
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index e7928fee833a..09b0b736a751 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -29,8 +29,8 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
         int ret;
 
         memset(port, 0, sizeof *port);
-        spd = of_get_property(np, "current-speed", NULL);
-        clk = of_get_property(np, "clock-frequency", NULL);
+        spd = get_property(np, "current-speed", NULL);
+        clk = get_property(np, "clock-frequency", NULL);
         if (!clk) {
                 dev_warn(&ofdev->dev, "no clock-frequency property set\n");
                 return -ENODEV;
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index cd92a3966b0c..be8d75721a85 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1452,12 +1452,12 @@ no_dma:
          */
         if (device_is_compatible(np, "cobalt"))
                 uap->flags |= PMACZILOG_FLAG_IS_INTMODEM;
-        conn = of_get_property(np, "AAPL,connector", &len);
+        conn = get_property(np, "AAPL,connector", &len);
         if (conn && (strcmp(conn, "infrared") == 0))
                 uap->flags |= PMACZILOG_FLAG_IS_IRDA;
         uap->port_type = PMAC_SCC_ASYNC;
         /* 1999 Powerbook G3 has slot-names property instead */
-        slots = of_get_property(np, "slot-names", &len);
+        slots = get_property(np, "slot-names", &len);
         if (slots && slots->count > 0) {
                 if (strcmp(slots->name, "IrDA") == 0)
                         uap->flags |= PMACZILOG_FLAG_IS_IRDA;
@@ -1471,7 +1471,7 @@ no_dma:
                         of_find_node_by_name(NULL, "i2c-modem");
                 if (i2c_modem) {
                         const char* mid =
-                                of_get_property(i2c_modem, "modem-id", NULL);
+                                get_property(i2c_modem, "modem-id", NULL);
                         if (mid) switch(*mid) {
                         case 0x04 :
                         case 0x05 :
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 497263038d1b..1bf6f42eb400 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -422,7 +422,7 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 
         if (dp == NULL)
                 return -ENODEV;
-        val = of_get_property(dp, "ATY,RefCLK", NULL);
+        val = get_property(dp, "ATY,RefCLK", NULL);
         if (!val || !*val) {
                 printk(KERN_WARNING "radeonfb: No ATY,RefCLK property !\n");
                 return -EINVAL;
@@ -430,11 +430,11 @@ static int __devinit radeon_read_xtal_OF (struct radeonfb_info *rinfo)
 
         rinfo->pll.ref_clk = (*val) / 10;
 
-        val = of_get_property(dp, "ATY,SCLK", NULL);
+        val = get_property(dp, "ATY,SCLK", NULL);
         if (val && *val)
                 rinfo->pll.sclk = (*val) / 10;
 
-        val = of_get_property(dp, "ATY,MCLK", NULL);
+        val = get_property(dp, "ATY,MCLK", NULL);
         if (val && *val)
                 rinfo->pll.mclk = (*val) / 10;
 
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c
index ec7a5d4c76da..38c7dbf8c151 100644
--- a/drivers/video/aty/radeon_monitor.c
+++ b/drivers/video/aty/radeon_monitor.c
@@ -65,12 +65,12 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         static char *propnames[] = { "DFP,EDID", "LCD,EDID", "EDID",
                                      "EDID1", "EDID2",  NULL };
         const u8 *pedid = NULL;
-        const u8 *pmt;
+        const u8 *pmt = NULL;
         u8 *tmp;
         int i, mt = MT_NONE;  
         
         RTRACE("analyzing OF properties...\n");
-        pmt = of_get_property(dp, "display-type", NULL);
+        pmt = get_property(dp, "display-type", NULL);
         if (!pmt)
                 return MT_NONE;
         RTRACE("display-type: %s\n", pmt);
@@ -89,7 +89,7 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
         }
 
         for (i = 0; propnames[i] != NULL; ++i) {
-                pedid = of_get_property(dp, propnames[i], NULL);
+                pedid = get_property(dp, propnames[i], NULL);
                 if (pedid != NULL)
                         break;
         }
@@ -98,10 +98,9 @@ static int __devinit radeon_parse_montype_prop(struct device_node *dp, u8 **out_
          * single-head cards have hdno == -1 and skip this step
          */
         if (pedid == NULL && dp->parent && (hdno != -1))
-                pedid = of_get_property(dp->parent,
-                                (hdno == 0) ? "EDID1" : "EDID2", NULL);
+                pedid = get_property(dp->parent, (hdno == 0) ? "EDID1" : "EDID2", NULL);
         if (pedid == NULL && dp->parent && (hdno == 0))
-                pedid = of_get_property(dp->parent, "EDID", NULL);
+                pedid = get_property(dp->parent, "EDID", NULL);
         if (pedid == NULL)
                 return mt;
 
@@ -131,7 +130,7 @@ static int __devinit radeon_probe_OF_head(struct radeonfb_info *rinfo, int head_
                 do {
                         if (!dp)
                                 return MT_NONE;
-                        pname = of_get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                         if (!pname)
                                 return MT_NONE;
                         len = strlen(pname);
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 1786ae188322..c411293cefc8 100644
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -1290,7 +1290,7 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
                 if (rinfo->of_node != NULL) {
                         int size;
 
-                        mrtable = of_get_property(rinfo->of_node, "ATY,MRT", &size);
+                        mrtable = get_property(rinfo->of_node, "ATY,MRT", &size);
                         if (mrtable)
                                 mrtable_size = size >> 2;
                         else
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c
index 73afd7eb9977..163a774a1b30 100644
--- a/drivers/video/nvidia/nv_of.c
+++ b/drivers/video/nvidia/nv_of.c
@@ -46,15 +46,15 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
 
                 for (dp = NULL;
                      (dp = of_get_next_child(parent, dp)) != NULL;) {
-                        pname = of_get_property(dp, "name", NULL);
+                        pname = get_property(dp, "name", NULL);
                         if (!pname)
                                 continue;
                         len = strlen(pname);
                         if ((pname[len-1] == 'A' && conn == 1) ||
                             (pname[len-1] == 'B' && conn == 2)) {
                                 for (i = 0; propnames[i] != NULL; ++i) {
-                                        pedid = of_get_property(dp,
-                                                        propnames[i], NULL);
+                                        pedid = get_property(dp, propnames[i],
+                                                             NULL);
                                         if (pedid != NULL)
                                                 break;
                                 }
@@ -65,7 +65,7 @@ int nvidia_probe_of_connector(struct fb_info *info, int conn, u8 **out_edid)
         }
         if (pedid == NULL) {
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = of_get_property(parent, propnames[i], NULL);
+                        pedid = get_property(parent, propnames[i], NULL);
                         if (pedid != NULL)
                                 break;
                 }
diff --git a/drivers/video/offb.c b/drivers/video/offb.c
index 3cf603c0127f..9576a55eaf16 100644
--- a/drivers/video/offb.c
+++ b/drivers/video/offb.c
@@ -425,27 +425,27 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
         const u32 *pp, *addrp, *up;
         u64 asize;
 
-        pp = of_get_property(dp, "linux,bootx-depth", &len);
+        pp = get_property(dp, "linux,bootx-depth", &len);
         if (pp == NULL)
-                pp = of_get_property(dp, "depth", &len);
+                pp = get_property(dp, "depth", &len);
         if (pp && len == sizeof(u32))
                 depth = *pp;
 
-        pp = of_get_property(dp, "linux,bootx-width", &len);
+        pp = get_property(dp, "linux,bootx-width", &len);
         if (pp == NULL)
-                pp = of_get_property(dp, "width", &len);
+                pp = get_property(dp, "width", &len);
         if (pp && len == sizeof(u32))
                 width = *pp;
 
-        pp = of_get_property(dp, "linux,bootx-height", &len);
+        pp = get_property(dp, "linux,bootx-height", &len);
         if (pp == NULL)
-                pp = of_get_property(dp, "height", &len);
+                pp = get_property(dp, "height", &len);
         if (pp && len == sizeof(u32))
                 height = *pp;
 
-        pp = of_get_property(dp, "linux,bootx-linebytes", &len);
+        pp = get_property(dp, "linux,bootx-linebytes", &len);
         if (pp == NULL)
-                pp = of_get_property(dp, "linebytes", &len);
+                pp = get_property(dp, "linebytes", &len);
         if (pp && len == sizeof(u32) && (*pp != 0xffffffffu))
                 pitch = *pp;
         else
@@ -463,9 +463,9 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node)
          * ranges and pick one that is both big enough and if possible encloses
          * the "address" property. If none match, we pick the biggest
          */
-        up = of_get_property(dp, "linux,bootx-addr", &len);
+        up = get_property(dp, "linux,bootx-addr", &len);
         if (up == NULL)
-                up = of_get_property(dp, "address", &len);
+                up = get_property(dp, "address", &len);
         if (up && len == sizeof(u32))
                 addr_prop = *up;
 
@@ -521,7 +521,7 @@ static int __init offb_init(void)
                 return -ENODEV;
 
         /* Check if we have a MacOS display without a node spec */
-        if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
+        if (get_property(of_chosen, "linux,bootx-noscreen", NULL) != NULL) {
                 /* The old code tried to work out which node was the MacOS
                  * display based on the address. I'm dropping that since the
                  * lack of a node spec only happens with old BootX versions
@@ -532,14 +532,14 @@ static int __init offb_init(void)
         }
 
         for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (of_get_property(dp, "linux,opened", NULL) &&
-                    of_get_property(dp, "linux,boot-display", NULL)) {
+                if (get_property(dp, "linux,opened", NULL) &&
+                    get_property(dp, "linux,boot-display", NULL)) {
                         boot_disp = dp;
                         offb_init_nodriver(dp, 0);
                 }
         }
         for (dp = NULL; (dp = of_find_node_by_type(dp, "display"));) {
-                if (of_get_property(dp, "linux,opened", NULL) &&
+                if (get_property(dp, "linux,opened", NULL) &&
                     dp != boot_disp)
                         offb_init_nodriver(dp, 0);
         }
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 9c6bd0991852..d7ece8d17a2c 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1760,13 +1760,13 @@ static int __devinit riva_get_EDID_OF(struct fb_info *info, struct pci_dev *pd)
         NVTRACE_ENTER();
         dp = pci_device_to_OF_node(pd);
         for (; dp != NULL; dp = dp->child) {
-                disptype = of_get_property(dp, "display-type", NULL);
+                disptype = get_property(dp, "display-type", NULL);
                 if (disptype == NULL)
                         continue;
                 if (strncmp(disptype, "LCD", 3) != 0)
                         continue;
                 for (i = 0; propnames[i] != NULL; ++i) {
-                        pedid = of_get_property(dp, propnames[i], NULL);
+                        pedid = get_property(dp, propnames[i], NULL);
                         if (pedid != NULL) {
                                 par->EDID = (unsigned char *)pedid;
                                 NVTRACE("LCD found.\n");