summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-06-30 00:33:52 +0800
committerMark Brown <broonie@linaro.org>2013-07-01 11:16:15 +0100
commit8c7e7ddf31ca9943b70e58d1c47d059beda435bd (patch)
treeefbef0c11233af5954be39e96e8b983d87938026 /drivers/regulator
parentf3ecdd7bf6a782a6eafe9c2c5d39fcb487e2a154 (diff)
downloadlinux-8c7e7ddf31ca9943b70e58d1c47d059beda435bd.tar.bz2
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/max77693.c4
1 files changed, 1 insertions, 3 deletions
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;