3 files changed, 5 insertions, 5 deletions

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index 7f980be5d060..e91f9f66f395 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1061,7 +1061,7 @@ static int onyx_i2c_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, "pcm3052")) {
+                if (of_device_is_compatible(dev, "pcm3052")) {
                         const u32 *addr;
                         printk(KERN_DEBUG PFX "found pcm3052\n");
                         addr = of_get_property(dev, "reg", NULL);
@@ -1074,7 +1074,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
         /* if that didn't work, try desperate mode for older
          * machines that have stuff missing from the device tree */
         
-        if (!device_is_compatible(busnode, "k2-i2c"))
+        if (!of_device_is_compatible(busnode, "k2-i2c"))
                 return -ENODEV;
 
         printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n");
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index ceca38486eae..041fe52cbf29 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -938,7 +938,7 @@ static int tas_i2c_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, "tas3004")) {
+                if (of_device_is_compatible(dev, "tas3004")) {
                         const u32 *addr;
                         printk(KERN_DEBUG PFX "found tas3004\n");
                         addr = of_get_property(dev, "reg", NULL);
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index 79fc4bc09e5e..0fccdbf51663 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -336,8 +336,8 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
         }
 
         while ((np = of_get_next_child(dev->ofdev.node, np))) {
-                if (device_is_compatible(np, "i2sbus") ||
-                    device_is_compatible(np, "i2s-modem")) {
+                if (of_device_is_compatible(np, "i2sbus") ||
+                    of_device_is_compatible(np, "i2s-modem")) {
                         got += i2sbus_add_dev(dev, control, np);
                 }
         }