[POWERPC] Use of_get_next_parent() in platforms/cell/axon_msi.c
authorMichael Ellerman <michael@ellerman.id.au>
Thu, 24 Apr 2008 02:08:54 +0000 (12:08 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 24 Apr 2008 10:58:03 +0000 (20:58 +1000)
Replace two open-coded occurences of the of_get_next_parent() logic.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/platforms/cell/axon_msi.c

index d95e71dee91f85f000a1662c200f2075b6bec95f..c39f5c225f2e6420b45fc8afd1bbc2a0c379fa8b 100644 (file)
@@ -123,7 +123,7 @@ static struct axon_msic *find_msi_translator(struct pci_dev *dev)
                return NULL;
        }
 
-       for (; dn; tmp = of_get_parent(dn), of_node_put(dn), dn = tmp) {
+       for (; dn; dn = of_get_next_parent(dn)) {
                ph = of_get_property(dn, "msi-translator", NULL);
                if (ph)
                        break;
@@ -169,7 +169,7 @@ static int axon_msi_check_device(struct pci_dev *dev, int nvec, int type)
 
 static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)
 {
-       struct device_node *dn, *tmp;
+       struct device_node *dn;
        struct msi_desc *entry;
        int len;
        const u32 *prop;
@@ -182,7 +182,7 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)
 
        entry = list_first_entry(&dev->msi_list, struct msi_desc, list);
 
-       for (; dn; tmp = of_get_parent(dn), of_node_put(dn), dn = tmp) {
+       for (; dn; dn = of_get_next_parent(dn)) {
                if (entry->msi_attrib.is_64) {
                        prop = of_get_property(dn, "msi-address-64", &len);
                        if (prop)