of: add 'of_' prefix to machine_is_compatible()

machine is compatible is an OF-specific call.  It should have
the of_ prefix to protect the global namespace.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Michal Simek <monstr@monstr.eu>

10 files changed, 34 insertions, 34 deletions

diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index 1b426050a2f9..0125604d096e 100644
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -80,8 +80,8 @@ static void xes_mpc85xx_configure_l2(void __iomem *l2_base)
         printk(KERN_INFO "xes_mpc85xx: Enabling L2 as cache\n");
 
         ctl = MPC85xx_L2CTL_L2E | MPC85xx_L2CTL_L2I;
-        if (machine_is_compatible("MPC8540") ||
-            machine_is_compatible("MPC8560"))
+        if (of_machine_is_compatible("MPC8540") ||
+            of_machine_is_compatible("MPC8560"))
                 /*
                  * Assume L2 SRAM is used fully for cache, so set
                  * L2BLKSZ (bits 4:5) to match L2SIZ (bits 2:3).
diff --git a/arch/powerpc/platforms/cell/cbe_powerbutton.c b/arch/powerpc/platforms/cell/cbe_powerbutton.c
index dcddaa5fcb66..f75a4daa4ca2 100644
--- a/arch/powerpc/platforms/cell/cbe_powerbutton.c
+++ b/arch/powerpc/platforms/cell/cbe_powerbutton.c
@@ -48,7 +48,7 @@ static int __init cbe_powerbutton_init(void)
         int ret = 0;
         struct input_dev *dev;
 
-        if (!machine_is_compatible("IBM,CBPLUS-1.0")) {
+        if (!of_machine_is_compatible("IBM,CBPLUS-1.0")) {
                 printk(KERN_ERR "%s: Not a cell blade.\n", __func__);
                 ret = -ENODEV;
                 goto out;
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 5e0a191764fc..608fd2b584c9 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -255,7 +255,7 @@ static int __init cbe_sysreset_init(void)
 {
         struct cbe_pmd_regs __iomem *regs;
 
-        sysreset_hack = machine_is_compatible("IBM,CBPLUS-1.0");
+        sysreset_hack = of_machine_is_compatible("IBM,CBPLUS-1.0");
         if (!sysreset_hack)
                 return 0;
 
diff --git a/arch/powerpc/platforms/pasemi/cpufreq.c b/arch/powerpc/platforms/pasemi/cpufreq.c
index be2527a516ea..d35e0520abf0 100644
--- a/arch/powerpc/platforms/pasemi/cpufreq.c
+++ b/arch/powerpc/platforms/pasemi/cpufreq.c
@@ -304,8 +304,8 @@ static struct cpufreq_driver pas_cpufreq_driver = {
 
 static int __init pas_cpufreq_init(void)
 {
-        if (!machine_is_compatible("PA6T-1682M") &&
-            !machine_is_compatible("pasemi,pwrficient"))
+        if (!of_machine_is_compatible("PA6T-1682M") &&
+            !of_machine_is_compatible("pasemi,pwrficient"))
                 return -ENODEV;
 
         return cpufreq_register_driver(&pas_cpufreq_driver);
diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c
index 08d94e4cedd3..d4f127d18141 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_32.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_32.c
@@ -657,31 +657,31 @@ static int __init pmac_cpufreq_setup(void)
         cur_freq = (*value) / 1000;
 
         /*  Check for 7447A based MacRISC3 */
-        if (machine_is_compatible("MacRISC3") &&
+        if (of_machine_is_compatible("MacRISC3") &&
             of_get_property(cpunode, "dynamic-power-step", NULL) &&
             PVR_VER(mfspr(SPRN_PVR)) == 0x8003) {
                 pmac_cpufreq_init_7447A(cpunode);
         /* Check for other MacRISC3 machines */
-        } else if (machine_is_compatible("PowerBook3,4") ||
-                   machine_is_compatible("PowerBook3,5") ||
-                   machine_is_compatible("MacRISC3")) {
+        } else if (of_machine_is_compatible("PowerBook3,4") ||
+                   of_machine_is_compatible("PowerBook3,5") ||
+                   of_machine_is_compatible("MacRISC3")) {
                 pmac_cpufreq_init_MacRISC3(cpunode);
         /* Else check for iBook2 500/600 */
-        } else if (machine_is_compatible("PowerBook4,1")) {
+        } else if (of_machine_is_compatible("PowerBook4,1")) {
                 hi_freq = cur_freq;
                 low_freq = 400000;
                 set_speed_proc = pmu_set_cpu_speed;
                 is_pmu_based = 1;
         }
         /* Else check for TiPb 550 */
-        else if (machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {
+        else if (of_machine_is_compatible("PowerBook3,3") && cur_freq == 550000) {
                 hi_freq = cur_freq;
                 low_freq = 500000;
                 set_speed_proc = pmu_set_cpu_speed;
                 is_pmu_based = 1;
         }
         /* Else check for TiPb 400 & 500 */
-        else if (machine_is_compatible("PowerBook3,2")) {
+        else if (of_machine_is_compatible("PowerBook3,2")) {
                 /* We only know about the 400 MHz and the 500Mhz model
                  * they both have 300 MHz as low frequency
                  */
diff --git a/arch/powerpc/platforms/powermac/cpufreq_64.c b/arch/powerpc/platforms/powermac/cpufreq_64.c
index 708c75133377..3ed288e68ec4 100644
--- a/arch/powerpc/platforms/powermac/cpufreq_64.c
+++ b/arch/powerpc/platforms/powermac/cpufreq_64.c
@@ -398,11 +398,11 @@ static int __init g5_neo2_cpufreq_init(struct device_node *cpus)
         int rc = -ENODEV;
 
         /* Check supported platforms */
-        if (machine_is_compatible("PowerMac8,1") ||
-            machine_is_compatible("PowerMac8,2") ||
-            machine_is_compatible("PowerMac9,1"))
+        if (of_machine_is_compatible("PowerMac8,1") ||
+            of_machine_is_compatible("PowerMac8,2") ||
+            of_machine_is_compatible("PowerMac9,1"))
                 use_volts_smu = 1;
-        else if (machine_is_compatible("PowerMac11,2"))
+        else if (of_machine_is_compatible("PowerMac11,2"))
                 use_volts_vdnap = 1;
         else
                 return -ENODEV;
@@ -729,9 +729,9 @@ static int __init g5_cpufreq_init(void)
                 return -ENODEV;
         }
 
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 rc = g5_pm72_cpufreq_init(cpus);
 #ifdef CONFIG_PMAC_SMU
         else
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index fbc9bbd74dbd..33e815f4466c 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2426,7 +2426,7 @@ static int __init probe_motherboard(void)
             }
         }
         for(i=0; i<ARRAY_SIZE(pmac_mb_defs); i++) {
-            if (machine_is_compatible(pmac_mb_defs[i].model_string)) {
+            if (of_machine_is_compatible(pmac_mb_defs[i].model_string)) {
                 pmac_mb = pmac_mb_defs[i];
                 goto found;
             }
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index b40c22d697f0..6898e8241cd0 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -693,9 +693,9 @@ static void __init smp_core99_setup(int ncpus)
 #ifdef CONFIG_PPC64
 
         /* i2c based HW sync on some G5s */
-        if (machine_is_compatible("PowerMac7,2") ||
-            machine_is_compatible("PowerMac7,3") ||
-            machine_is_compatible("RackMac3,1"))
+        if (of_machine_is_compatible("PowerMac7,2") ||
+            of_machine_is_compatible("PowerMac7,3") ||
+            of_machine_is_compatible("RackMac3,1"))
                 smp_core99_setup_i2c_hwsync(ncpus);
 
         /* pfunc based HW sync on recent G5s */
@@ -713,7 +713,7 @@ static void __init smp_core99_setup(int ncpus)
 #else /* CONFIG_PPC64 */
 
         /* GPIO based HW sync on ppc32 Core99 */
-        if (pmac_tb_freeze == NULL && !machine_is_compatible("MacRISC4")) {
+        if (pmac_tb_freeze == NULL && !of_machine_is_compatible("MacRISC4")) {
                 struct device_node *cpu;
                 const u32 *tbprop = NULL;
 
@@ -750,7 +750,7 @@ static void __init smp_core99_setup(int ncpus)
 #endif
 
         /* 32 bits SMP can't NAP */
-        if (!machine_is_compatible("MacRISC4"))
+        if (!of_machine_is_compatible("MacRISC4"))
                 powersave_nap = 0;
 }
 
@@ -852,7 +852,7 @@ static void __devinit smp_core99_setup_cpu(int cpu_nr)
                 /* If we didn't start the second CPU, we must take
                  * it off the bus
                  */
-                if (machine_is_compatible("MacRISC4") &&
+                if (of_machine_is_compatible("MacRISC4") &&
                     num_online_cpus() < 2)              
                         g5_phy_disable_cpu1();
 #endif /* CONFIG_PPC64 */
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index 1810e4226e56..48211ca134c3 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -317,9 +317,9 @@ void __init pmac_calibrate_decr(void)
          * calibration. That's better since the VIA itself seems
          * to be slightly off. --BenH
          */
-        if (!machine_is_compatible("MacRISC2") &&
-            !machine_is_compatible("MacRISC3") &&
-            !machine_is_compatible("MacRISC4"))
+        if (!of_machine_is_compatible("MacRISC2") &&
+            !of_machine_is_compatible("MacRISC3") &&
+            !of_machine_is_compatible("MacRISC4"))
                 if (via_calibrate_decr())
                         return;
 
@@ -328,7 +328,7 @@ void __init pmac_calibrate_decr(void)
          * probably implement calibration based on the KL timer on these
          * machines anyway... -BenH
          */
-        if (machine_is_compatible("PowerMac3,5"))
+        if (of_machine_is_compatible("PowerMac3,5"))
                 if (via_calibrate_decr())
                         return;
 #endif
diff --git a/arch/powerpc/platforms/powermac/udbg_scc.c b/arch/powerpc/platforms/powermac/udbg_scc.c
index 9490157da62e..d83135a9830e 100644
--- a/arch/powerpc/platforms/powermac/udbg_scc.c
+++ b/arch/powerpc/platforms/powermac/udbg_scc.c
@@ -132,9 +132,9 @@ void udbg_scc_init(int force_scc)
                 scc_inittab[1] = in_8(sccc);
                 out_8(sccc, 12);
                 scc_inittab[3] = in_8(sccc);
-        } else if (machine_is_compatible("RackMac1,1")
-                   || machine_is_compatible("RackMac1,2")
-                   || machine_is_compatible("MacRISC4")) {
+        } else if (of_machine_is_compatible("RackMac1,1")
+                   || of_machine_is_compatible("RackMac1,2")
+                   || of_machine_is_compatible("MacRISC4")) {
                 /* Xserves and G5s default to 57600 */
                 scc_inittab[1] = 0;
                 scc_inittab[3] = 0;