浏览代码

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>
Michael Ellerman 9 年之前
父节点
当前提交
16c1d60626
共有 1 个文件被更改,包括 2 次插入3 次删除
  1. 2 3
      arch/powerpc/kernel/prom.c

+ 2 - 3
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;
 }