7 files changed, 13 insertions, 13 deletions

diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index a98a328b1cfc..f8e1a135bf9d 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -606,7 +606,7 @@ static void smu_expose_childs(struct work_struct *unused)
         struct device_node *np;
 
         for (np = NULL; (np = of_get_next_child(smu->of_node, np)) != NULL;)
-                if (device_is_compatible(np, "smu-sensors"))
+                if (of_device_is_compatible(np, "smu-sensors"))
                         of_platform_device_create(np, "smu-sensors",
                                                   &smu->of_dev->dev);
 }
diff --git a/drivers/macintosh/therm_adt746x.c b/drivers/macintosh/therm_adt746x.c
index 228903403cfc..178afa1fd56c 100644
--- a/drivers/macintosh/therm_adt746x.c
+++ b/drivers/macintosh/therm_adt746x.c
@@ -560,9 +560,9 @@ thermostat_init(void)
         np = of_find_node_by_name(NULL, "fan");
         if (!np)
                 return -ENODEV;
-        if (device_is_compatible(np, "adt7460"))
+        if (of_device_is_compatible(np, "adt7460"))
                 therm_type = ADT7460;
-        else if (device_is_compatible(np, "adt7467"))
+        else if (of_device_is_compatible(np, "adt7467"))
                 therm_type = ADT7467;
         else
                 return -ENODEV;
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 1729d3fd7a11..0707624dfad3 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -310,14 +310,14 @@ int __init find_via_pmu(void)
                         PMU_INT_TICK;
         
         if (vias->parent->name && ((strcmp(vias->parent->name, "ohare") == 0)
-            || device_is_compatible(vias->parent, "ohare")))
+            || of_device_is_compatible(vias->parent, "ohare")))
                 pmu_kind = PMU_OHARE_BASED;
-        else if (device_is_compatible(vias->parent, "paddington"))
+        else if (of_device_is_compatible(vias->parent, "paddington"))
                 pmu_kind = PMU_PADDINGTON_BASED;
-        else if (device_is_compatible(vias->parent, "heathrow"))
+        else if (of_device_is_compatible(vias->parent, "heathrow"))
                 pmu_kind = PMU_HEATHROW_BASED;
-        else if (device_is_compatible(vias->parent, "Keylargo")
-                 || device_is_compatible(vias->parent, "K2-Keylargo")) {
+        else if (of_device_is_compatible(vias->parent, "Keylargo")
+                 || of_device_is_compatible(vias->parent, "K2-Keylargo")) {
                 struct device_node *gpiop;
                 struct device_node *adbp;
                 u64 gaddr = OF_BAD_ADDR;
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index ab4d1b63f63e..a0fabf3c2008 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -188,10 +188,10 @@ static int wf_lm75_attach(struct i2c_adapter *adapter)
                 if (loc == NULL || addr == 0)
                         continue;
                 /* real lm75 */
-                if (device_is_compatible(dev, "lm75"))
+                if (of_device_is_compatible(dev, "lm75"))
                         wf_lm75_create(adapter, addr, 0, loc);
                 /* ds1775 (compatible, better resolution */
-                else if (device_is_compatible(dev, "ds1775"))
+                else if (of_device_is_compatible(dev, "ds1775"))
                         wf_lm75_create(adapter, addr, 1, loc);
         }
         return 0;
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index eaa74afa175b..5f03aab9fb5d 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -131,7 +131,7 @@ static int wf_max6690_attach(struct i2c_adapter *adapter)
                  */
                 if (!pmac_i2c_match_adapter(dev, adapter))
                         continue;
-                if (!device_is_compatible(dev, "max6690"))
+                if (!of_device_is_compatible(dev, "max6690"))
                         continue;
                 addr = pmac_i2c_get_dev_addr(dev);
                 loc = of_get_property(dev, "hwsensor-location", NULL);
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index ff398adc0283..58c2590f05ec 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -263,7 +263,7 @@ static int __init smu_controls_init(void)
         /* Look for RPM fans */
         for (fans = NULL; (fans = of_get_next_child(smu, fans)) != NULL;)
                 if (!strcmp(fans->name, "rpm-fans") ||
-                    device_is_compatible(fans, "smu-rpm-fans"))
+                    of_device_is_compatible(fans, "smu-rpm-fans"))
                         break;
         for (fan = NULL;
              fans && (fan = of_get_next_child(fans, fan)) != NULL;) {
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 9a6c2cf8fd0e..1043b39aa123 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -380,7 +380,7 @@ static int wf_sat_attach(struct i2c_adapter *adapter)
         busnode = pmac_i2c_get_bus_node(bus);
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL)
-                if (device_is_compatible(dev, "smu-sat"))
+                if (of_device_is_compatible(dev, "smu-sat"))
                         wf_sat_create(adapter, dev);
         return 0;
 }