Revert "[POWERPC] Rename get_property to of_get_property: drivers"

This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3,
which included changes which should go via other subsystem
maintainers.

3 files changed, 10 insertions, 11 deletions

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