From 16c1d606263ea37754be0d0ed655ab1c99c4cf7e Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 26 Oct 2015 09:48:46 +0900 Subject: 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 Signed-off-by: Michael Ellerman --- arch/powerpc/kernel/prom.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/powerpc') 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) { 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; } -- cgit v1.2.1