10 files changed, 23 insertions, 18 deletions

diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
index 84bb07d39a7f..91852e49910e 100644
--- a/sound/aoa/codecs/onyx.c
+++ b/sound/aoa/codecs/onyx.c
@@ -33,6 +33,7 @@
  */
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa");
diff --git a/sound/aoa/codecs/tas.c b/sound/aoa/codecs/tas.c
index 1dd66ddffcaf..fd2188c3df2b 100644
--- a/sound/aoa/codecs/tas.c
+++ b/sound/aoa/codecs/tas.c
@@ -66,6 +66,7 @@
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 
 MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
 MODULE_LICENSE("GPL");
diff --git a/sound/aoa/codecs/toonie.c b/sound/aoa/codecs/toonie.c
index f13827e17562..69d2cb601f2a 100644
--- a/sound/aoa/codecs/toonie.c
+++ b/sound/aoa/codecs/toonie.c
@@ -11,6 +11,7 @@
  */
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("toonie codec driver for snd-aoa");
diff --git a/sound/aoa/core/gpio-pmf.c b/sound/aoa/core/gpio-pmf.c
index 1dd0c28d1fb7..7e267c9379bc 100644
--- a/sound/aoa/core/gpio-pmf.c
+++ b/sound/aoa/core/gpio-pmf.c
@@ -6,6 +6,7 @@
  * GPL v2, can be found in COPYING.
  */
 
+#include <linux/slab.h>
 #include <asm/pmac_feature.h>
 #include <asm/pmac_pfunc.h>
 #include "../aoa.h"
@@ -115,12 +116,9 @@ static void pmf_gpio_exit(struct gpio_runtime *rt)
         mutex_destroy(&rt->line_in_notify.mutex);
         mutex_destroy(&rt->line_out_notify.mutex);
 
-        if (rt->headphone_notify.gpio_private)
-                kfree(rt->headphone_notify.gpio_private);
-        if (rt->line_in_notify.gpio_private)
-                kfree(rt->line_in_notify.gpio_private);
-        if (rt->line_out_notify.gpio_private)
-                kfree(rt->line_out_notify.gpio_private);
+        kfree(rt->headphone_notify.gpio_private);
+        kfree(rt->line_in_notify.gpio_private);
+        kfree(rt->line_out_notify.gpio_private);
 }
 
 static void pmf_handle_notify_irq(void *data)
diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 7a437da05646..3fd1a7e24928 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -12,6 +12,7 @@
 #include <asm/prom.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 #include "../aoa.h"
 #include "../soundbus/soundbus.h"
 
@@ -991,7 +992,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
                 return -ENODEV;
 
         /* by breaking out we keep a reference */
-        while ((sound = of_get_next_child(sdev->ofdev.node, sound))) {
+        while ((sound = of_get_next_child(sdev->ofdev.dev.of_node, sound))) {
                 if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
                         break;
         }
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index fa8ab2815a98..99ca7120e269 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -74,11 +74,11 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
         of = &soundbus_dev->ofdev;
 
         /* stuff we want to pass to /sbin/hotplug */
-        retval = add_uevent_var(env, "OF_NAME=%s", of->node->name);
+        retval = add_uevent_var(env, "OF_NAME=%s", of->dev.of_node->name);
         if (retval)
                 return retval;
 
-        retval = add_uevent_var(env, "OF_TYPE=%s", of->node->type);
+        retval = add_uevent_var(env, "OF_TYPE=%s", of->dev.of_node->type);
         if (retval)
                 return retval;
 
@@ -86,7 +86,7 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = of_get_property(of->node, "compatible", &cplen);
+        compat = of_get_property(of->dev.of_node, "compatible", &cplen);
         while (compat && cplen > 0) {
                 int tmp = env->buflen;
                 retval = add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat);
@@ -169,7 +169,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
 
         /* sanity checks */
         if (!dev->attach_codec ||
-            !dev->ofdev.node ||
+            !dev->ofdev.dev.of_node ||
             dev->pcmname ||
             dev->pcmid != -1) {
                 printk(KERN_ERR "soundbus: adding device failed sanity check!\n");
diff --git a/sound/aoa/soundbus/i2sbus/control.c b/sound/aoa/soundbus/i2sbus/control.c
index 87beb4ad4d63..4dc9b49c02cf 100644
--- a/sound/aoa/soundbus/i2sbus/control.c
+++ b/sound/aoa/soundbus/i2sbus/control.c
@@ -8,6 +8,7 @@
 
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -41,7 +42,7 @@ int i2sbus_control_add_dev(struct i2sbus_control *c,
 {
         struct device_node *np;
 
-        np = i2sdev->sound.ofdev.node;
+        np = i2sdev->sound.ofdev.dev.of_node;
         i2sdev->enable = pmf_find_function(np, "enable");
         i2sdev->cell_enable = pmf_find_function(np, "cell-enable");
         i2sdev->clock_enable = pmf_find_function(np, "clock-enable");
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 4e3b819d4993..678933721735 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -7,6 +7,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/dma-mapping.h>
@@ -220,9 +221,9 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 
         mutex_init(&dev->lock);
         spin_lock_init(&dev->low_lock);
-        dev->sound.ofdev.node = np;
-        dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask;
-        dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask;
+        dev->sound.ofdev.archdata.dma_mask = macio->ofdev.archdata.dma_mask;
+        dev->sound.ofdev.dev.of_node = np;
+        dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.archdata.dma_mask;
         dev->sound.ofdev.dev.parent = &macio->ofdev.dev;
         dev->sound.ofdev.dev.release = i2sbus_release_dev;
         dev->sound.attach_codec = i2sbus_attach_codec;
@@ -345,7 +346,7 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
                 return -ENODEV;
         }
 
-        while ((np = of_get_next_child(dev->ofdev.node, np))) {
+        while ((np = of_get_next_child(dev->ofdev.dev.of_node, np))) {
                 if (of_device_is_compatible(np, "i2sbus") ||
                     of_device_is_compatible(np, "i2s-modem")) {
                         got += i2sbus_add_dev(dev, control, np);
diff --git a/sound/aoa/soundbus/i2sbus/pcm.c b/sound/aoa/soundbus/i2sbus/pcm.c
index 59bacd365733..be838993926d 100644
--- a/sound/aoa/soundbus/i2sbus/pcm.c
+++ b/sound/aoa/soundbus/i2sbus/pcm.c
@@ -8,6 +8,7 @@
 
 #include <asm/io.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 #include <sound/core.h>
 #include <asm/macio.h>
 #include <linux/pci.h>
diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c
index f580942b5c09..6496e754f00a 100644
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c
@@ -9,7 +9,7 @@ field##_show (struct device *dev, struct device_attribute *attr,	\
               char *buf)                                                \
 {                                                                       \
         struct soundbus_dev *mdev = to_soundbus_device (dev);           \
-        return sprintf (buf, format_string, mdev->ofdev.node->field);   \
+        return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
@@ -25,7 +25,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                 length = strlen(buf);
         } else {
                 length = sprintf(buf, "of:N%sT%s\n",
-                                 of->node->name, of->node->type);
+                                 of->dev.of_node->name, of->dev.of_node->type);
         }
 
         return length;