Commit 8c7e7ddf authored Jun 30, 2013 by Axel Lin Committed by Mark Brown Jul 01, 2013

regulator: max77693: Remove NULL test for rmatch[i].init_data



The implementation in of_regulator_match() already ensures match->init_data is
not NULL for all matched cases if the return value of of_regulator_match() > 0.

Thus remove NULL test for rmatch[i].init_data.

This patch also fixes the condition for loop iteration.
The for loop should iterate "matched" times rather than ARRAY_SIZE(regulators)
because we only allocate "matched" number of entries for rdata.
Though in most cases, "matched" == ARRAY_SIZE(regulators).

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

parent f3ecdd7b

drivers/regulator/max77693.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -190,9 +190,7 @@ static int max77693_pmic_dt_parse_rdata(struct device *dev,

		tmp = *rdata;

		for (i = 0; i < ARRAY_SIZE(regulators); i++) {
		if (!rmatch[i].init_data)
		continue;
		for (i = 0; i < matched; i++) {
		tmp->initdata = rmatch[i].init_data;
		tmp->of_node = rmatch[i].of_node;
		tmp->id = regulators[i].id;