diff mbox series

powerpc: xics: Use of_address_count()

Message ID 20230327223056.820086-1-robh@kernel.org (mailing list archive)
State Accepted
Commit 037c47a436eab2d336d5e131ab1c1394f223a57b
Headers show
Series powerpc: xics: Use of_address_count() | expand

Commit Message

Rob Herring (Arm) March 27, 2023, 10:30 p.m. UTC 
icp_native_init_one_node() only needs the number of entries in "reg".
Replace the open coded "reg" parsing with of_address_count() to get the
number of "reg" entries.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 arch/powerpc/sysdev/xics/icp-native.c | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

Comments

Michael Ellerman April 6, 2023, 1:09 a.m. UTC | #1 
On Mon, 27 Mar 2023 17:30:56 -0500, Rob Herring wrote:
> icp_native_init_one_node() only needs the number of entries in "reg".
> Replace the open coded "reg" parsing with of_address_count() to get the
> number of "reg" entries.
> 
> 

Applied to powerpc/next.

[1/1] powerpc: xics: Use of_address_count()
      https://git.kernel.org/powerpc/c/037c47a436eab2d336d5e131ab1c1394f223a57b

cheers
diff mbox series

Patch

diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index edc17b6b1cc2..f6ec6dba92dc 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -259,7 +259,7 @@  static int __init icp_native_init_one_node(struct device_node *np,
 	unsigned int ilen;
 	const __be32 *ireg;
 	int i;
-	int reg_tuple_size;
+	int num_reg;
 	int num_servers = 0;
 
 	/* This code does the theorically broken assumption that the interrupt
@@ -280,21 +280,14 @@  static int __init icp_native_init_one_node(struct device_node *np,
 			num_servers = of_read_number(ireg + 1, 1);
 	}
 
-	ireg = of_get_property(np, "reg", &ilen);
-	if (!ireg) {
-		pr_err("icp_native: Can't find interrupt reg property");
-		return -1;
-	}
-
-	reg_tuple_size = (of_n_addr_cells(np) + of_n_size_cells(np)) * 4;
-	if (((ilen % reg_tuple_size) != 0)
-	    || (num_servers && (num_servers != (ilen / reg_tuple_size)))) {
+	num_reg = of_address_count(np);
+	if (num_servers && (num_servers != num_reg)) {
 		pr_err("icp_native: ICP reg len (%d) != num servers (%d)",
-		       ilen / reg_tuple_size, num_servers);
+		       num_reg, num_servers);
 		return -1;
 	}
 
-	for (i = 0; i < (ilen / reg_tuple_size); i++) {
+	for (i = 0; i < num_reg; i++) {
 		struct resource r;
 		int err;