From 8c7e7ddf31ca9943b70e58d1c47d059beda435bd Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 30 Jun 2013 00:33:52 +0800 Subject: 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 Acked-by: Jonghwa Lee Signed-off-by: Mark Brown --- drivers/regulator/max77693.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/regulator/max77693.c b/drivers/regulator/max77693.c index d45a4dd17131..ce4b96c15eba 100644 --- a/drivers/regulator/max77693.c +++ b/drivers/regulator/max77693.c @@ -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; -- cgit v1.2.3-58-ga151