clk: Correct lookup logic in clk_fetch_parent_index()

This function is supposed to iterate over all parents of given child clock to find the index of given parent clock in its parent list, using parent cache if possible and falling back to string compare otherwise. However currently the logic falls back to string compare in every iteration in which clock cache entry does not match given parent, due to wrong check conditions. This patch corrects the logic to continue the loop if parent cache entry is present and does not match requested parent clock. In addition, redundant checks for parent cache array presence are removed, because it is always allocated in the beginning of the function. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>

clk: Correct lookup logic in clk_fetch_parent_index()
This function is supposed to iterate over all parents of given child clock to find the index of given parent clock in its parent list, using parent cache if possible and falling back to string compare otherwise. However currently the logic falls back to string compare in every iteration in which clock cache entry does not match given parent, due to wrong check conditions. This patch corrects the logic to continue the loop if parent cache entry is present and does not match requested parent clock. In addition, redundant checks for parent cache array presence are removed, because it is always allocated in the beginning of the function. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Tomasz Figa · Mike Turquette
1 parent 96a7ed9079
Showing 1 changed file with 7 additions and 4 deletions Side-by-side Diff
drivers/clk/clk.c
@@ -1097,11 +1097,14 @@
 	 * them now to avoid future calls to __clk_lookup.
 	 */
 	for (i = 0; i < clk->num_parents; i++) {
-		if (clk->parents && clk->parents[i] == parent)
+		if (clk->parents[i] == parent)
 			return i;
-		else if (!strcmp(clk->parent_names[i], parent->name)) {
-			if (clk->parents)
-				clk->parents[i] = __clk_lookup(parent->name);
+
+		if (clk->parents[i])
+			continue;
+
+		if (!strcmp(clk->parent_names[i], parent->name)) {
+			clk->parents[i] = __clk_lookup(parent->name);
 			return i;
 		}
 	}
...	...	@@ -1097,11 +1097,14 @@
1097	1097	* them now to avoid future calls to __clk_lookup.
1098	1098	*/
1099	1099	for (i = 0; i < clk->num_parents; i++) {
1100		- if (clk->parents && clk->parents[i] == parent)
	1100	+ if (clk->parents[i] == parent)
1101	1101	return i;
1102		- else if (!strcmp(clk->parent_names[i], parent->name)) {
1103		- if (clk->parents)
1104		- clk->parents[i] = __clk_lookup(parent->name);
	1102	+
	1103	+ if (clk->parents[i])
	1104	+ continue;
	1105	+
	1106	+ if (!strcmp(clk->parent_names[i], parent->name)) {
	1107	+ clk->parents[i] = __clk_lookup(parent->name);
1105	1108	return i;
1106	1109	}
1107	1110	}