powerpc/prom: Use of_get_next_parent() in of_get_ibm_chip_id()
authorMichael Ellerman <mpe@ellerman.id.au>
Mon, 26 Oct 2015 00:48:46 +0000 (09:48 +0900)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 28 Oct 2015 03:08:32 +0000 (12:08 +0900)
Use of_get_next_parent() to simplifiy the logic in of_get_ibm_chip_id().

Original-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/prom.c

index 0b0a416..7030b03 100644 (file)
@@ -784,7 +784,6 @@ int of_get_ibm_chip_id(struct device_node *np)
 {
        of_node_get(np);
        while (np) {
-               struct device_node *old = np;
                u32 chip_id;
 
                /*
@@ -795,8 +794,8 @@ int of_get_ibm_chip_id(struct device_node *np)
                        of_node_put(np);
                        return chip_id;
                }
-               np = of_get_parent(np);
-               of_node_put(old);
+
+               np = of_get_next_parent(np);
        }
        return -1;
 }