4 files changed, 103 insertions, 54 deletions

diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index 977b91cea603..730fa1d001a5 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -346,14 +346,16 @@ 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 =
@@ -362,20 +364,24 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int*
                                 break;
                 } else if (compatible && device_is_compatible(np, compatible))
                         break;
-                np = np->sibling;
+                np = of_get_next_child(gpiop, np);
         }
         if (!np)
-                return -ENODEV;
+                goto done;
         pp = of_get_property(np, "AAPL,address", NULL);
         if (!pp)
-                return -ENODEV;
+                goto done;
         *gpio_addr = (*pp) & 0x0000ffff;
         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
@@ -2552,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...
@@ -2596,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;
 }
 
@@ -2634,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 */
 }
 
@@ -2827,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
@@ -2839,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;
                 }
         }
 
@@ -2848,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
@@ -2866,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);
@@ -2881,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,
@@ -2890,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,
@@ -2901,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();
@@ -2913,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";
@@ -2941,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.
@@ -2990,6 +3005,8 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
 
                 /* if it's there use it to set up frame rates */
                 init_frame_rates(prop, l) ;
+                of_node_put(info);
+                info = NULL;
         }
 
         if (awacs)
@@ -3159,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)
@@ -3178,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 11257600d6d0..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 *);
@@ -191,13 +190,14 @@ int __init
 tas_init(int driver_id, const char *driver_name)
 {
         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 = of_get_property(tas_node, "i2c-address", NULL);
@@ -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/ppc/pmac.c b/sound/ppc/pmac.c
index 5e829683d1ad..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,7 +864,8 @@ 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;
+        struct device_node *sound;
+        struct device_node *dn;
         const unsigned int *prop;
         unsigned int l;
         struct macio_chip* macio;
@@ -891,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,
@@ -918,12 +919,14 @@ 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 = of_get_property(sound, "sub-frame", NULL);
         if (prop && *prop < 16)
                 chip->subframe = *prop;
@@ -934,6 +937,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                 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 */
@@ -971,7 +975,9 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
         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 ...
@@ -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 8e01b558131d..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) {
+        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);
@@ -1083,6 +1092,7 @@ static long tumbler_find_device(const char *device, const char *platform,
                 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;
@@ -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 */
@@ -1342,9 +1354,9 @@ 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;
 
@@ -1355,6 +1367,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
                 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);