aboutsummaryrefslogtreecommitdiffstats
path: root/sound/aoa/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'sound/aoa/codecs')
-rw-r--r--sound/aoa/codecs/snd-aoa-codec-onyx.c4
-rw-r--r--sound/aoa/codecs/snd-aoa-codec-tas.c2
2 files changed, 3 insertions, 3 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)
1061 busnode = pmac_i2c_get_bus_node(bus); 1061 busnode = pmac_i2c_get_bus_node(bus);
1062 1062
1063 while ((dev = of_get_next_child(busnode, dev)) != NULL) { 1063 while ((dev = of_get_next_child(busnode, dev)) != NULL) {
1064 if (device_is_compatible(dev, "pcm3052")) { 1064 if (of_device_is_compatible(dev, "pcm3052")) {
1065 const u32 *addr; 1065 const u32 *addr;
1066 printk(KERN_DEBUG PFX "found pcm3052\n"); 1066 printk(KERN_DEBUG PFX "found pcm3052\n");
1067 addr = of_get_property(dev, "reg", NULL); 1067 addr = of_get_property(dev, "reg", NULL);
@@ -1074,7 +1074,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
1074 /* if that didn't work, try desperate mode for older 1074 /* if that didn't work, try desperate mode for older
1075 * machines that have stuff missing from the device tree */ 1075 * machines that have stuff missing from the device tree */
1076 1076
1077 if (!device_is_compatible(busnode, "k2-i2c")) 1077 if (!of_device_is_compatible(busnode, "k2-i2c"))
1078 return -ENODEV; 1078 return -ENODEV;
1079 1079
1080 printk(KERN_DEBUG PFX "found k2-i2c, checking if onyx chip is on it\n"); 1080 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)
938 busnode = pmac_i2c_get_bus_node(bus); 938 busnode = pmac_i2c_get_bus_node(bus);
939 939
940 while ((dev = of_get_next_child(busnode, dev)) != NULL) { 940 while ((dev = of_get_next_child(busnode, dev)) != NULL) {
941 if (device_is_compatible(dev, "tas3004")) { 941 if (of_device_is_compatible(dev, "tas3004")) {
942 const u32 *addr; 942 const u32 *addr;
943 printk(KERN_DEBUG PFX "found tas3004\n"); 943 printk(KERN_DEBUG PFX "found tas3004\n");
944 addr = of_get_property(dev, "reg", NULL); 944 addr = of_get_property(dev, "reg", NULL);