aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2015-10-25 20:48:46 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-10-27 23:08:32 -0400
commit16c1d606263ea37754be0d0ed655ab1c99c4cf7e (patch)
tree0b01dab5e281a3152906ea188b114e84bc32367b
parentf755ecfb8cec7b19dff84295309f2afb24a5afd1 (diff)
powerpc/prom: Use of_get_next_parent() in of_get_ibm_chip_id()
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>
-rw-r--r--arch/powerpc/kernel/prom.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 0b0a4166d69d..7030b035905d 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -784,7 +784,6 @@ int of_get_ibm_chip_id(struct device_node *np)
784{ 784{
785 of_node_get(np); 785 of_node_get(np);
786 while (np) { 786 while (np) {
787 struct device_node *old = np;
788 u32 chip_id; 787 u32 chip_id;
789 788
790 /* 789 /*
@@ -795,8 +794,8 @@ int of_get_ibm_chip_id(struct device_node *np)
795 of_node_put(np); 794 of_node_put(np);
796 return chip_id; 795 return chip_id;
797 } 796 }
798 np = of_get_parent(np); 797
799 of_node_put(old); 798 np = of_get_next_parent(np);
800 } 799 }
801 return -1; 800 return -1;
802} 801}