[PATCH v2 -next] powerpc/pseries/memory-hotplug: Fix return value type of find_aa_index

[YueHaibing]

'aa_index' is defined as an unsigned value, but find_aa_index
may return -1 when dlpar_clone_property fails. So we use an rc
value to track the validation of finding the aa_index instead
of the 'aa_index' value itself

Fixes: c05a5a40969e ("powerpc/pseries: Dynamic add entires to associativity lookup array")
Signed-off-by: YueHaibing <yuehaibing at huawei.com>
---
v2: use 'rc' track the validation of aa_index
---
 arch/powerpc/platforms/pseries/hotplug-memory.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 9a15d39..796e68b 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -101,13 +101,12 @@ static struct property *dlpar_clone_property(struct property *prop,
 	return new_prop;
 }
 
-static u32 find_aa_index(struct device_node *dr_node,
-			 struct property *ala_prop, const u32 *lmb_assoc)
+static int find_aa_index(struct device_node *dr_node, struct property *ala_prop,
+			 const u32 *lmb_assoc, u32 *aa_index)
 {
 	u32 *assoc_arrays;
-	u32 aa_index;
 	int aa_arrays, aa_array_entries, aa_array_sz;
-	int i, index;
+	int i, index, rc = -1;
 
 	/*
 	 * The ibm,associativity-lookup-arrays property is defined to be
@@ -121,18 +120,18 @@ static u32 find_aa_index(struct device_node *dr_node,
 	aa_array_entries = be32_to_cpu(assoc_arrays[1]);
 	aa_array_sz = aa_array_entries * sizeof(u32);
 
-	aa_index = -1;
 	for (i = 0; i < aa_arrays; i++) {
 		index = (i * aa_array_entries) + 2;
 
 		if (memcmp(&assoc_arrays[index], &lmb_assoc[1], aa_array_sz))
 			continue;
 
-		aa_index = i;
+		*aa_index = i;
+		rc = 0;
 		break;
 	}
 
-	if (aa_index == -1) {
+	if (rc == -1) {
 		struct property *new_prop;
 		u32 new_prop_size;
 
@@ -157,10 +156,11 @@ static u32 find_aa_index(struct device_node *dr_node,
 		 * number of entries - 1 since we added its associativity
 		 * to the end of the lookup array.
 		 */
-		aa_index = be32_to_cpu(assoc_arrays[0]) - 1;
+		*aa_index = be32_to_cpu(assoc_arrays[0]) - 1;
+		rc = 0;
 	}
 
-	return aa_index;
+	return rc;
 }
 
 static int update_lmb_associativity_index(struct drmem_lmb *lmb)
@@ -169,6 +169,7 @@ static int update_lmb_associativity_index(struct drmem_lmb *lmb)
 	struct property *ala_prop;
 	const u32 *lmb_assoc;
 	u32 aa_index;
+	int rc;
 
 	parent = of_find_node_by_path("/");
 	if (!parent)
@@ -200,11 +201,11 @@ static int update_lmb_associativity_index(struct drmem_lmb *lmb)
 		return -ENODEV;
 	}
 
-	aa_index = find_aa_index(dr_node, ala_prop, lmb_assoc);
+	rc = find_aa_index(dr_node, ala_prop, lmb_assoc, &aa_index);
 
 	dlpar_free_cc_nodes(lmb_node);
 
-	if (aa_index < 0) {
+	if (rc < 0) {
 		pr_err("Could not find LMB associativity\n");
 		return -1;
 	}
-- 
2.7.0