25 files changed, 195 insertions, 171 deletions

diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c
index b00fc4842c93..7f980be5d060 100644
--- a/sound/aoa/codecs/snd-aoa-codec-onyx.c
+++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c
@@ -1062,9 +1062,9 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
                 if (device_is_compatible(dev, "pcm3052")) {
-                        u32 *addr;
+                        const u32 *addr;
                         printk(KERN_DEBUG PFX "found pcm3052\n");
-                        addr = (u32 *) get_property(dev, "reg", NULL);
+                        addr = of_get_property(dev, "reg", NULL);
                         if (!addr)
                                 return -ENODEV;
                         return onyx_create(adapter, dev, (*addr)>>1);
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c
index 2cd81fa07ce1..ceca38486eae 100644
--- a/sound/aoa/codecs/snd-aoa-codec-tas.c
+++ b/sound/aoa/codecs/snd-aoa-codec-tas.c
@@ -939,9 +939,9 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
 
         while ((dev = of_get_next_child(busnode, dev)) != NULL) {
                 if (device_is_compatible(dev, "tas3004")) {
-                        u32 *addr;
+                        const u32 *addr;
                         printk(KERN_DEBUG PFX "found tas3004\n");
-                        addr = (u32 *) get_property(dev, "reg", NULL);
+                        addr = of_get_property(dev, "reg", NULL);
                         if (!addr)
                                 continue;
                         return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f);
@@ -950,9 +950,10 @@ static int tas_i2c_attach(struct i2c_adapter *adapter)
                  * property that says 'tas3004', they just have a 'deq'
                  * node without any such property... */
                 if (strcmp(dev->name, "deq") == 0) {
-                        u32 *_addr, addr;
+                        const u32 *_addr;
+                        u32 addr;
                         printk(KERN_DEBUG PFX "found 'deq' node\n");
-                        _addr = (u32 *) get_property(dev, "i2c-address", NULL);
+                        _addr = of_get_property(dev, "i2c-address", NULL);
                         if (!_addr)
                                 continue;
                         addr = ((*_addr) >> 1) & 0x7f;
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c
index 2b03bc798bcb..805dcbff2257 100644
--- a/sound/aoa/core/snd-aoa-gpio-feature.c
+++ b/sound/aoa/core/snd-aoa-gpio-feature.c
@@ -55,7 +55,7 @@ static struct device_node *get_gpio(char *name,
                                     int *gpioactiveptr)
 {
         struct device_node *np, *gpio;
-        u32 *reg;
+        const u32 *reg;
         const char *audio_gpio;
 
         *gpioptr = -1;
@@ -71,7 +71,7 @@ static struct device_node *get_gpio(char *name,
                 if (!gpio)
                         return NULL;
                 while ((np = of_get_next_child(gpio, np))) {
-                        audio_gpio = get_property(np, "audio-gpio", NULL);
+                        audio_gpio = of_get_property(np, "audio-gpio", NULL);
                         if (!audio_gpio)
                                 continue;
                         if (strcmp(audio_gpio, name) == 0)
@@ -84,7 +84,7 @@ static struct device_node *get_gpio(char *name,
                         return NULL;
         }
 
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = of_get_property(np, "reg", NULL);
         if (!reg)
                 return NULL;
 
@@ -96,7 +96,7 @@ static struct device_node *get_gpio(char *name,
         if (*gpioptr < 0x50)
                 *gpioptr += 0x50;
 
-        reg = (u32 *)get_property(np, "audio-gpio-active-state", NULL);
+        reg = of_get_property(np, "audio-gpio-active-state", NULL);
         if (!reg)
                 /* Apple seems to default to 1, but
                  * that doesn't seem right at least on most
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
index 1b94ba6dd279..98806283d1b2 100644
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
+++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -724,7 +724,7 @@ static int check_codec(struct aoa_codec *codec,
                        struct layout_dev *ldev,
                        struct codec_connect_info *cci)
 {
-        u32 *ref;
+        const u32 *ref;
         char propname[32];
         struct codec_connection *cc;
 
@@ -732,7 +732,7 @@ static int check_codec(struct aoa_codec *codec,
         if (codec->node && (strcmp(codec->node->name, "codec") == 0)) {
                 snprintf(propname, sizeof(propname),
                          "platform-%s-codec-ref", codec->name);
-                ref = (u32*)get_property(ldev->sound, propname, NULL);
+                ref = of_get_property(ldev->sound, propname, NULL);
                 if (!ref) {
                         printk(KERN_INFO "snd-aoa-fabric-layout: "
                                 "required property %s not present\n", propname);
@@ -946,7 +946,7 @@ static struct aoa_fabric layout_fabric = {
 static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
 {
         struct device_node *sound = NULL;
-        unsigned int *layout_id;
+        const unsigned int *layout_id;
         struct layout *layout;
         struct layout_dev *ldev = NULL;
         int err;
@@ -962,7 +962,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
         }
         if (!sound) return -ENODEV;
 
-        layout_id = (unsigned int *) get_property(sound, "layout-id", NULL);
+        layout_id = of_get_property(sound, "layout-id", NULL);
         if (!layout_id)
                 goto outnodev;
         printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n",
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index 47b3e3768df0..8b2e9b905cda 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -61,9 +61,9 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
 {
         struct soundbus_dev * soundbus_dev;
         struct of_device * of;
-        char *scratch, *compat, *compat2;
-        int i = 0;
-        int length, cplen, cplen2, seen = 0;
+        const char *compat;
+        int retval = 0, i = 0, length = 0;
+        int cplen, seen = 0;
 
         if (!dev)
                 return -ENODEV;
@@ -75,63 +75,47 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp,
         of = &soundbus_dev->ofdev;
 
         /* stuff we want to pass to /sbin/hotplug */
-        envp[i++] = scratch = buffer;
-        length = scnprintf (scratch, buffer_size, "OF_NAME=%s", of->node->name);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_TYPE=%s", of->node->type);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_NAME=%s", of->node->name);
+        if (retval)
+                return retval;
+
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_TYPE=%s", of->node->type);
+        if (retval)
+                return retval;
 
         /* Since the compatible field can contain pretty much anything
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = (char *) get_property(of->node, "compatible", &cplen);
-        compat2 = compat;
-        cplen2= cplen;
+        compat = of_get_property(of->node, "compatible", &cplen);
         while (compat && cplen > 0) {
-                envp[i++] = scratch;
-                length = scnprintf (scratch, buffer_size,
-                                     "OF_COMPATIBLE_%d=%s", seen, compat);
-                ++length;
-                buffer_size -= length;
-                if ((buffer_size <= 0) || (i >= num_envp))
-                        return -ENOMEM;
-                scratch += length;
-                length = strlen (compat) + 1;
-                compat += length;
-                cplen -= length;
-                seen++;
+                int tmp = length;
+                retval = add_uevent_var(envp, num_envp, &i,
+                                        buffer, buffer_size, &length,
+                                        "OF_COMPATIBLE_%d=%s", seen, compat);
+                if (retval)
+                        return retval;
+                compat += length - tmp;
+                cplen -= length - tmp;
+                seen += 1;
         }
 
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "OF_COMPATIBLE_N=%d", seen);
-        ++length;
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
-        scratch += length;
-
-        envp[i++] = scratch;
-        length = scnprintf (scratch, buffer_size, "MODALIAS=%s",
-                        soundbus_dev->modalias);
-
-        buffer_size -= length;
-        if ((buffer_size <= 0) || (i >= num_envp))
-                return -ENOMEM;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "OF_COMPATIBLE_N=%d", seen);
+        if (retval)
+                return retval;
+        retval = add_uevent_var(envp, num_envp, &i,
+                                buffer, buffer_size, &length,
+                                "MODALIAS=%s", soundbus_dev->modalias);
 
         envp[i] = NULL;
 
-        return 0;
+        return retval;
 }
 
 static int soundbus_device_remove(struct device *dev)
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index e36f6aa448d4..79fc4bc09e5e 100644
--- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -122,7 +122,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
 {
         struct device_node *parent;
         int pindex, rc = -ENXIO;
-        u32 *reg;
+        const u32 *reg;
 
         /* Machines with layout 76 and 36 (K2 based) have a weird device
          * tree what we need to special case.
@@ -141,7 +141,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index,
         rc = of_address_to_resource(parent, pindex, res);
         if (rc)
                 goto bail;
-        reg = (u32 *)get_property(np, "reg", NULL);
+        reg = of_get_property(np, "reg", NULL);
         if (reg == NULL) {
                 rc = -ENXIO;
                 goto bail;
@@ -188,8 +188,8 @@ static int i2sbus_add_dev(struct macio_dev *macio,
                 }
         }
         if (i == 1) {
-                u32 *layout_id;
-                layout_id = (u32*) get_property(sound, "layout-id", NULL);
+                const u32 *layout_id =
+                        of_get_property(sound, "layout-id", NULL);
                 if (layout_id) {
                         layout = *layout_id;
                         snprintf(dev->sound.modalias, 32,
diff --git a/sound/core/init.c b/sound/core/init.c
index 4a431e3ea3a2..f2fe35737186 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/ctype.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 
 #include <sound/core.h>
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c
index a339f0c0d512..23018a7c063a 100644
--- a/sound/oss/au1550_ac97.c
+++ b/sound/oss/au1550_ac97.c
@@ -47,7 +47,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/poll.h>
-#include <linux/pci.h>
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 37773b1deea5..730fa1d001a5 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -257,7 +257,7 @@ static volatile struct dbdma_cmd *emergency_dbdma_cmd;
 /*
  * Stuff for restoring after a sleep.
  */
-static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when);
+static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when);
 struct pmu_sleep_notifier awacs_sleep_notifier = {
         awacs_sleep_notify, SLEEP_LEVEL_SOUND,
 };
@@ -346,36 +346,42 @@ int gpio_headphone_irq;
 int
 setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* gpio_pol)
 {
+        struct device_node *gpiop;
         struct device_node *np;
         const u32* pp;
+        int ret = -ENODEV;
 
-        np = find_devices("gpio");
-        if (!np)
-                return -ENODEV;
+        gpiop = of_find_node_by_name(NULL, "gpio");
+        if (!gpiop)
+                goto done;
 
-        np = np->child;
+        np = of_get_next_child(gpiop, NULL);
         while(np != 0) {
                 if (name) {
                         const char *property =
-                                get_property(np,"audio-gpio",NULL);
+                                of_get_property(np,"audio-gpio",NULL);
                         if (property != 0 && strcmp(property,name) == 0)
                                 break;
                 } else if (compatible && device_is_compatible(np, compatible))
                         break;
-                np = np->sibling;
+                np = of_get_next_child(gpiop, np);
         }
         if (!np)
-                return -ENODEV;
-        pp = get_property(np, "AAPL,address", NULL);
+                goto done;
+        pp = of_get_property(np, "AAPL,address", NULL);
         if (!pp)
-                return -ENODEV;
+                goto done;
         *gpio_addr = (*pp) & 0x0000ffff;
-        pp = get_property(np, "audio-gpio-active-state", NULL);
+        pp = of_get_property(np, "audio-gpio-active-state", NULL);
         if (pp)
                 *gpio_pol = *pp;
         else
                 *gpio_pol = 1;
-        return irq_of_parse_and_map(np, 0);
+        ret = irq_of_parse_and_map(np, 0);
+done:
+        of_node_put(np);
+        of_node_put(gpiop);
+        return ret;
 }
 
 static inline void
@@ -578,7 +584,7 @@ tas_mixer_ioctl(u_int cmd, u_long arg)
 }
 
 static void __init
-tas_init_frame_rates(unsigned int *prop, unsigned int l)
+tas_init_frame_rates(const unsigned int *prop, unsigned int l)
 {
         int i ;
         if (prop) {
@@ -1419,7 +1425,7 @@ load_awacs(void)
  * Save state when going to sleep, restore it afterwards.
  */
 /* FIXME: sort out disabling/re-enabling of read stuff as well */
-static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
+static void awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
 {
         unsigned long flags;
 
@@ -1548,7 +1554,6 @@ static int awacs_sleep_notify(struct pmu_sleep_notifier *self, int when)
                 spin_unlock_irqrestore(&dmasound.lock, flags);
                 UNLOCK();
         }
-        return PBOOK_SLEEP_OK;
 }
 #endif /* CONFIG_PM */
 
@@ -2553,32 +2558,33 @@ set_model(void)
 static struct device_node* __init
 get_snd_io_node(void)
 {
-        struct device_node *np = NULL;
+        struct device_node *np;
 
         /* set up awacs_node for early OF which doesn't have a full set of
          * properties on davbus
-        */
-
-        awacs_node = find_devices("awacs");
+         */
+        awacs_node = of_find_node_by_name(NULL, "awacs");
         if (awacs_node)
                 awacs_revision = AWACS_AWACS;
 
         /* powermac models after 9500 (other than those which use DACA or
          * Tumbler) have a node called "davbus".
          */
-        np = find_devices("davbus");
+        np = of_find_node_by_name(NULL, "davbus");
         /*
          * if we didn't find a davbus device, try 'i2s-a' since
          * this seems to be what iBooks (& Tumbler) have.
          */
-        if (np == NULL)
-                np = i2s_node = find_devices("i2s-a");
+        if (np == NULL) {
+                i2s_node = of_find_node_by_name(NULL, "i2s-a");
+                np = of_node_get(i2s_node);
+        }
 
         /* if we didn't find this - perhaps we are on an early model
          * which _only_ has an 'awacs' node
         */
         if (np == NULL && awacs_node)
-                np = awacs_node ;
+                np = of_node_get(awacs_node);
 
         /* if we failed all these return null - this will cause the
          * driver to give up...
@@ -2597,9 +2603,9 @@ get_snd_info_node(struct device_node *io)
 {
         struct device_node *info;
 
-        info = find_devices("sound");
-        while (info && info->parent != io)
-                info = info->next;
+        for_each_node_by_name(info, "sound")
+                if (info->parent == io)
+                        break;
         return info;
 }
 
@@ -2635,11 +2641,17 @@ get_codec_type(struct device_node *info)
 static void __init
 get_expansion_type(void)
 {
-        if (find_devices("perch") != NULL)
+        struct device_node *dn;
+
+        dn = of_find_node_by_name(NULL, "perch");
+        if (dn != NULL)
                 has_perch = 1;
+        of_node_put(dn);
 
-        if (find_devices("pb-ziva-pc") != NULL)
+        dn = of_find_node_by_name(NULL, "pb-ziva-pc");
+        if (dn != NULL)
                 has_ziva = 1;
+        of_node_put(dn);
         /* need to work out how we deal with iMac SRS module */
 }
 
@@ -2652,7 +2664,7 @@ get_expansion_type(void)
 */
 
 static void __init
-awacs_init_frame_rates(unsigned int *prop, unsigned int l)
+awacs_init_frame_rates(const unsigned int *prop, unsigned int l)
 {
         int i ;
         if (prop) {
@@ -2675,7 +2687,7 @@ awacs_init_frame_rates(unsigned int *prop, unsigned int l)
 }
 
 static void __init
-burgundy_init_frame_rates(unsigned int *prop, unsigned int l)
+burgundy_init_frame_rates(const unsigned int *prop, unsigned int l)
 {
         int temp[9] ;
         int i = 0 ;
@@ -2701,7 +2713,7 @@ if (i > 1){
 }
 
 static void __init
-daca_init_frame_rates(unsigned int *prop, unsigned int l)
+daca_init_frame_rates(const unsigned int *prop, unsigned int l)
 {
         int temp[9] ;
         int i = 0 ;
@@ -2728,7 +2740,7 @@ if (i > 1){
 }
 
 static void __init
-init_frame_rates(unsigned int *prop, unsigned int l)
+init_frame_rates(const unsigned int *prop, unsigned int l)
 {
         switch (awacs_revision) {
                 case AWACS_TUMBLER:
@@ -2828,7 +2840,7 @@ int __init dmasound_awacs_init(void)
 #ifdef DEBUG_DMASOUND
 printk("dmasound_pmac: couldn't find sound io OF node\n");
 #endif
-                return -ENODEV ;
+                goto no_device;
         }
 
         /* find the OF node that tells us about the sound sub-system
@@ -2840,7 +2852,7 @@ printk("dmasound_pmac: couldn't find sound io OF node\n");
 #ifdef DEBUG_DMASOUND
 printk("dmasound_pmac: couldn't find 'sound' OF node\n");
 #endif
-                        return -ENODEV ;
+                        goto no_device;
                 }
         }
 
@@ -2849,7 +2861,7 @@ printk("dmasound_pmac: couldn't find 'sound' OF node\n");
 #ifdef DEBUG_DMASOUND
 printk("dmasound_pmac: couldn't find a Codec we can handle\n");
 #endif
-                return -ENODEV ; /* we don't know this type of h/w */
+                goto no_device; /* we don't know this type of h/w */
         }
 
         /* set up perch, ziva, SRS or whatever else we have as sound
@@ -2867,11 +2879,12 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                  * machines).
                  */
                 if (awacs_node) {
-                        io = awacs_node ;
+                        of_node_put(io);
+                        io = of_node_get(awacs_node);
                         if (of_get_address(io, 2, NULL, NULL) == NULL) {
                                 printk("dmasound_pmac: can't use %s\n",
                                        io->full_name);
-                                return -ENODEV;
+                                goto no_device;
                         }
                 } else
                         printk("dmasound_pmac: can't use %s\n", io->full_name);
@@ -2882,7 +2895,7 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                                awacs_rsrc[0].end - awacs_rsrc[0].start + 1,
                                " (IO)") == NULL) {
                 printk(KERN_ERR "dmasound: can't request IO resource !\n");
-                return -ENODEV;
+                goto no_device;
         }
         if (of_address_to_resource(io, 1, &awacs_rsrc[1]) ||
             request_mem_region(awacs_rsrc[1].start,
@@ -2891,7 +2904,7 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                 release_mem_region(awacs_rsrc[0].start,
                                    awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
                 printk(KERN_ERR "dmasound: can't request Tx DMA resource !\n");
-                return -ENODEV;
+                goto no_device;
         }
         if (of_address_to_resource(io, 2, &awacs_rsrc[2]) ||
             request_mem_region(awacs_rsrc[2].start,
@@ -2902,7 +2915,7 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                 release_mem_region(awacs_rsrc[1].start,
                                    awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
                 printk(KERN_ERR "dmasound: can't request Rx DMA resource !\n");
-                return -ENODEV;
+                goto no_device;
         }
 
         awacs_beep_dev = input_allocate_device();
@@ -2914,7 +2927,7 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
                 release_mem_region(awacs_rsrc[2].start,
                                    awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
                 printk(KERN_ERR "dmasound: can't allocate input device !\n");
-                return -ENOMEM;
+                goto no_device;
         }
 
         awacs_beep_dev->name = "dmasound beeper";
@@ -2942,7 +2955,8 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
         awacs_rx_irq = irq_of_parse_and_map(io, 2);
 
         /* Hack for legacy crap that will be killed someday */
-        awacs_node = io;
+        of_node_put(awacs_node);
+        awacs_node = of_node_get(io);
 
         /* if we have an awacs or screamer - probe the chip to make
          * sure we have the right revision.
@@ -2973,24 +2987,26 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
         */
 
         if (info) {
-                unsigned int *prop, l;
+                const unsigned int *prop;
+                unsigned int l;
 
                 sound_device_id = 0;
                 /* device ID appears post g3 b&w */
-                prop = (unsigned int *)get_property(info, "device-id", NULL);
+                prop = of_get_property(info, "device-id", NULL);
                 if (prop != 0)
                         sound_device_id = *prop;
 
                 /* look for a property saying what sample rates
                    are available */
 
-                prop = (unsigned int *)get_property(info, "sample-rates", &l);
+                prop = of_get_property(info, "sample-rates", &l);
                 if (prop == 0)
-                        prop = (unsigned int *) get_property
-                                (info, "output-frame-rates", &l);
+                        prop = of_get_property(info, "output-frame-rates", &l);
 
                 /* if it's there use it to set up frame rates */
                 init_frame_rates(prop, l) ;
+                of_node_put(info);
+                info = NULL;
         }
 
         if (awacs)
@@ -3160,7 +3176,16 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
          */
         input_register_device(awacs_beep_dev);
 
+        of_node_put(io);
+
         return dmasound_init();
+
+no_device:
+        of_node_put(info);
+        of_node_put(awacs_node);
+        of_node_put(i2s_node);
+        of_node_put(io);
+        return -ENODEV ;
 }
 
 static void __exit dmasound_awacs_cleanup(void)
@@ -3179,6 +3204,8 @@ static void __exit dmasound_awacs_cleanup(void)
         }
         dmasound_deinit();
 
+        of_node_put(awacs_node);
+        of_node_put(i2s_node);
 }
 
 MODULE_DESCRIPTION("PowerMac built-in audio driver.");
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index 665e85b5562b..b295ef682192 100644
--- a/sound/oss/dmasound/tas_common.c
+++ b/sound/oss/dmasound/tas_common.c
@@ -41,7 +41,6 @@
 
 static u8 tas_i2c_address = 0x34;
 static struct i2c_client *tas_client;
-static struct device_node* tas_node;
 
 static int tas_attach_adapter(struct i2c_adapter *);
 static int tas_detach_client(struct i2c_client *);
@@ -190,17 +189,18 @@ tas_cleanup(void)
 int __init
 tas_init(int driver_id, const char *driver_name)
 {
-        u32* paddr;
+        const u32* paddr;
+        struct device_node *tas_node;
 
         printk(KERN_INFO "tas driver [%s])\n", driver_name);
 
 #ifndef CONFIG_I2C_POWERMAC
         request_module("i2c-powermac");
 #endif
-        tas_node = find_devices("deq");
+        tas_node = of_find_node_by_name("deq");
         if (tas_node == NULL)
                 return -ENODEV;
-        paddr = (u32 *)get_property(tas_node, "i2c-address", NULL);
+        paddr = of_get_property(tas_node, "i2c-address", NULL);
         if (paddr) {
                 tas_i2c_address = (*paddr) >> 1;
                 printk(KERN_INFO "using i2c address: 0x%x from device-tree\n",
@@ -208,6 +208,7 @@ tas_init(int driver_id, const char *driver_name)
         } else    
                 printk(KERN_INFO "using i2c address: 0x%x (default)\n",
                                 tas_i2c_address);
+        of_node_put(tas_node);
 
         return i2c_add_driver(&tas_driver);
 }
diff --git a/sound/oss/dmasound/tas_ioctl.h b/sound/oss/dmasound/tas_ioctl.h
index dccae3a40e01..9d12b373b4a9 100644
--- a/sound/oss/dmasound/tas_ioctl.h
+++ b/sound/oss/dmasound/tas_ioctl.h
@@ -1,7 +1,6 @@
 #ifndef _TAS_IOCTL_H_
 #define _TAS_IOCTL_H_
 
-#include <linux/i2c.h>
 #include <linux/soundcard.h>
 
 
diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index dcd8d6d2f56f..a9c23b2502ad 100644
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -44,6 +44,7 @@
 #include <linux/smp_lock.h>
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/device.h>
 
 /*
  * This ought to be moved into include/asm/dma.h
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index b913a1fb8c21..9c3a9c8d1dc2 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -62,7 +62,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -71,6 +70,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
 #include <sound/tlv.h>
+#include <asm/io.h>
 
 #include "ca0106.h"
 
diff --git a/sound/pci/ca0106/ca0106_proc.c b/sound/pci/ca0106/ca0106_proc.c
index 75ca421eb3a1..ae80f51d8c4f 100644
--- a/sound/pci/ca0106/ca0106_proc.c
+++ b/sound/pci/ca0106/ca0106_proc.c
@@ -64,7 +64,6 @@
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -73,6 +72,7 @@
 #include <sound/ac97_codec.h>
 #include <sound/info.h>
 #include <sound/asoundef.h>
+#include <asm/io.h>
 
 #include "ca0106.h"
 
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 89c402770a1d..336e77e2600c 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 343f51d5311b..57e357de1500 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -24,7 +24,6 @@
 #include <sound/driver.h>
 #include <asm/io.h>
 #include <linux/delay.h>
-#include <linux/pci.h>
 #include <linux/pm.h>
 #include <linux/init.h>
 #include <linux/slab.h>
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 1589d2f2917f..1e5ff0cd3709 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -23,7 +23,6 @@
 #include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/hda_proc.c b/sound/pci/hda/hda_proc.c
index 17df4d0fe135..e313e685f161 100644
--- a/sound/pci/hda/hda_proc.c
+++ b/sound/pci/hda/hda_proc.c
@@ -23,7 +23,6 @@
 
 #include <sound/driver.h>
 #include <linux/init.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
index 7333f275decd..831469d3a923 100644
--- a/sound/pci/hda/patch_atihdmi.c
+++ b/sound/pci/hda/patch_atihdmi.c
@@ -25,7 +25,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index ed5e45e35963..6fcda9bcf0cf 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -26,7 +26,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 4c839b031729..2b11ac8689b9 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -35,7 +35,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/pci.h>
 #include <sound/core.h>
 #include "hda_codec.h"
 #include "hda_local.h"
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index c64af55865d4..2bae9c1a2b54 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -816,6 +816,7 @@ static int snd_pmac_free(struct snd_pmac *chip)
 
         if (chip->pdev)
                 pci_dev_put(chip->pdev);
+        of_node_put(chip->node);
         kfree(chip);
         return 0;
 }
@@ -863,8 +864,10 @@ static void __init detect_byte_swap(struct snd_pmac *chip)
  */
 static int __init snd_pmac_detect(struct snd_pmac *chip)
 {
-        struct device_node *sound = NULL;
-        unsigned int *prop, l;
+        struct device_node *sound;
+        struct device_node *dn;
+        const unsigned int *prop;
+        unsigned int l;
         struct macio_chip* macio;
 
         if (!machine_is(powermac))
@@ -890,22 +893,21 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
         else if (machine_is_compatible("PowerBook1,1")
                  || machine_is_compatible("AAPL,PowerBook1998"))
                 chip->is_pbook_G3 = 1;
-        chip->node = find_devices("awacs");
-        if (chip->node)
-                sound = chip->node;
+        chip->node = of_find_node_by_name(NULL, "awacs");
+        sound = of_node_get(chip->node);
 
         /*
          * powermac G3 models have a node called "davbus"
          * with a child called "sound".
          */
         if (!chip->node)
-                chip->node = find_devices("davbus");
+                chip->node = of_find_node_by_name(NULL, "davbus");
         /*
          * if we didn't find a davbus device, try 'i2s-a' since
          * this seems to be what iBooks have
          */
         if (! chip->node) {
-                chip->node = find_devices("i2s-a");
+                chip->node = of_find_node_by_name(NULL, "i2s-a");
                 if (chip->node && chip->node->parent &&
                     chip->node->parent->parent) {
                         if (device_is_compatible(chip->node->parent->parent,
@@ -917,22 +919,25 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 return -ENODEV;
 
         if (!sound) {
-                sound = find_devices("sound");
+                sound = of_find_node_by_name(NULL, "sound");
                 while (sound && sound->parent != chip->node)
-                        sound = sound->next;
+                        sound = of_find_node_by_name(sound, "sound");
         }
-        if (! sound)
+        if (! sound) {
+                of_node_put(chip->node);
                 return -ENODEV;
-        prop = (unsigned int *) get_property(sound, "sub-frame", NULL);
+        }
+        prop = of_get_property(sound, "sub-frame", NULL);
         if (prop && *prop < 16)
                 chip->subframe = *prop;
-        prop = (unsigned int *) get_property(sound, "layout-id", NULL);
+        prop = of_get_property(sound, "layout-id", NULL);
         if (prop) {
                 /* partly deprecate snd-powermac, for those machines
                  * that have a layout-id property for now */
                 printk(KERN_INFO "snd-powermac no longer handles any "
                                  "machines with a layout-id property "
                                  "in the device-tree, use snd-aoa.\n");
+                of_node_put(chip->node);
                 return -ENODEV;
         }
         /* This should be verified on older screamers */
@@ -967,10 +972,12 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 chip->freq_table = tumbler_freqs;
                 chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */
         }
-        prop = (unsigned int *)get_property(sound, "device-id", NULL);
+        prop = of_get_property(sound, "device-id", NULL);
         if (prop)
                 chip->device_id = *prop;
-        chip->has_iic = (find_devices("perch") != NULL);
+        dn = of_find_node_by_name(NULL, "perch");
+        chip->has_iic = (dn != NULL);
+        of_node_put(dn);
 
         /* We need the PCI device for DMA allocations, let's use a crude method
          * for now ...
@@ -997,10 +1004,9 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
 
         /* look for a property saying what sample rates
            are available */
-        prop = (unsigned int *) get_property(sound, "sample-rates", &l);
+        prop = of_get_property(sound, "sample-rates", &l);
         if (! prop)
-                prop = (unsigned int *) get_property(sound,
-                                                     "output-frame-rates", &l);
+                prop = of_get_property(sound, "output-frame-rates", &l);
         if (prop) {
                 int i;
                 chip->freqs_ok = 0;
@@ -1021,6 +1027,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 chip->freqs_ok = 1;
         }
 
+        of_node_put(sound);
         return 0;
 }
 
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c
index 8f074c7936e6..54e333fbb1d0 100644
--- a/sound/ppc/tumbler.c
+++ b/sound/ppc/tumbler.c
@@ -1031,32 +1031,40 @@ static irqreturn_t headphone_intr(int irq, void *devid)
 /* look for audio-gpio device */
 static struct device_node *find_audio_device(const char *name)
 {
+        struct device_node *gpiop;
         struct device_node *np;
   
-        if (! (np = find_devices("gpio")))
+        gpiop = of_find_node_by_name(NULL, "gpio");
+        if (! gpiop)
                 return NULL;
   
-        for (np = np->child; np; np = np->sibling) {
-                const char *property = get_property(np, "audio-gpio", NULL);
+        for (np = of_get_next_child(gpiop, NULL); np;
+                        np = of_get_next_child(gpiop, np)) {
+                const char *property = of_get_property(np, "audio-gpio", NULL);
                 if (property && strcmp(property, name) == 0)
-                        return np;
+                        break;
         }  
-        return NULL;
+        of_node_put(gpiop);
+        return np;
 }
 
 /* look for audio-gpio device */
 static struct device_node *find_compatible_audio_device(const char *name)
 {
+        struct device_node *gpiop;
         struct device_node *np;
   
-        if (! (np = find_devices("gpio")))
+        gpiop = of_find_node_by_name(NULL, "gpio");
+        if (!gpiop)
                 return NULL;
   
-        for (np = np->child; np; np = np->sibling) {
+        for (np = of_get_next_child(gpiop, NULL); np;
+                        np = of_get_next_child(gpiop, np)) {
                 if (device_is_compatible(np, name))
-                        return np;
+                        break;
         }  
-        return NULL;
+        of_node_put(gpiop);
+        return np;
 }
 
 /* find an audio device and get its address */
@@ -1066,6 +1074,7 @@ static long tumbler_find_device(const char *device, const char *platform,
         struct device_node *node;
         const u32 *base;
         u32 addr;
+        long ret;
 
         if (is_compatible)
                 node = find_compatible_audio_device(device);
@@ -1077,12 +1086,13 @@ static long tumbler_find_device(const char *device, const char *platform,
                 return -ENODEV;
         }
 
-        base = get_property(node, "AAPL,address", NULL);
+        base = of_get_property(node, "AAPL,address", NULL);
         if (! base) {
-                base = get_property(node, "reg", NULL);
+                base = of_get_property(node, "reg", NULL);
                 if (!base) {
                         DBG("(E) cannot find address for device %s !\n", device);
                         snd_printd("cannot find address for device %s\n", device);
+                        of_node_put(node);
                         return -ENODEV;
                 }
                 addr = *base;
@@ -1093,7 +1103,7 @@ static long tumbler_find_device(const char *device, const char *platform,
 
         gp->addr = addr & 0x0000ffff;
         /* Try to find the active state, default to 0 ! */
-        base = get_property(node, "audio-gpio-active-state", NULL);
+        base = of_get_property(node, "audio-gpio-active-state", NULL);
         if (base) {
                 gp->active_state = *base;
                 gp->active_val = (*base) ? 0x5 : 0x4;
@@ -1108,7 +1118,7 @@ static long tumbler_find_device(const char *device, const char *platform,
                  * as we don't yet have an interpreter for these things
                  */
                 if (platform)
-                        prop = get_property(node, platform, NULL);
+                        prop = of_get_property(node, platform, NULL);
                 if (prop) {
                         if (prop[3] == 0x9 && prop[4] == 0x9) {
                                 gp->active_val = 0xd;
@@ -1124,7 +1134,9 @@ static long tumbler_find_device(const char *device, const char *platform,
         DBG("(I) GPIO device %s found, offset: %x, active state: %d !\n",
             device, gp->addr, gp->active_state);
 
-        return irq_of_parse_and_map(node, 0);
+        ret = irq_of_parse_and_map(node, 0);
+        of_node_put(node);
+        return ret;
 }
 
 /* reset audio */
@@ -1310,7 +1322,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 {
         int i, err;
         struct pmac_tumbler *mix;
-        u32 *paddr;
+        const u32 *paddr;
         struct device_node *tas_node, *np;
         char *chipname;
 
@@ -1331,9 +1343,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
 
         for (np = chip->node->child; np; np = np->sibling) {
                 if (!strcmp(np->name, "sound")) {
-                        if (get_property(np, "has-anded-reset", NULL))
+                        if (of_get_property(np, "has-anded-reset", NULL))
                                 mix->anded_reset = 1;
-                        if (get_property(np, "layout-id", NULL))
+                        if (of_get_property(np, "layout-id", NULL))
                                 mix->reset_on_sleep = 0;
                         break;
                 }
@@ -1342,19 +1354,20 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
                 return err;
 
         /* set up TAS */
-        tas_node = find_devices("deq");
+        tas_node = of_find_node_by_name(NULL, "deq");
         if (tas_node == NULL)
-                tas_node = find_devices("codec");
+                tas_node = of_find_node_by_name(NULL, "codec");
         if (tas_node == NULL)
                 return -ENODEV;
 
-        paddr = (u32 *)get_property(tas_node, "i2c-address", NULL);
+        paddr = of_get_property(tas_node, "i2c-address", NULL);
         if (paddr == NULL)
-                paddr = (u32 *)get_property(tas_node, "reg", NULL);
+                paddr = of_get_property(tas_node, "reg", NULL);
         if (paddr)
                 mix->i2c.addr = (*paddr) >> 1;
         else
                 mix->i2c.addr = TAS_I2C_ADDR;
+        of_node_put(tas_node);
 
         DBG("(I) TAS i2c address is: %x\n", mix->i2c.addr);
 
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index c899786f30f5..07962a35f241 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1067,8 +1067,8 @@ out_err:
 
 static int __devinit amd7930_obio_attach(struct device_node *dp)
 {
-        struct linux_prom_registers *regs;
-        struct linux_prom_irqs *irqp;
+        const struct linux_prom_registers *regs;
+        const struct linux_prom_irqs *irqp;
         struct resource res, *rp;
         int len;
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index f5956d557f70..900a00de35fd 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2284,7 +2284,7 @@ static int __init cs4231_init(void)
                         if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
                                 match = 1;
                         } else if (!strcmp(edev->prom_node->name, "audio")) {
-                                char *compat;
+                                const char *compat;
 
                                 compat = of_get_property(edev->prom_node,
                                                          "compatible", NULL);