mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-09 13:54:00 +08:00
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>
This commit is contained in:
parent
f3ecdd7bf6
commit
8c7e7ddf31
@ -190,9 +190,7 @@ static int max77693_pmic_dt_parse_rdata(struct device *dev,
|
|||||||
|
|
||||||
tmp = *rdata;
|
tmp = *rdata;
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(regulators); i++) {
|
for (i = 0; i < matched; i++) {
|
||||||
if (!rmatch[i].init_data)
|
|
||||||
continue;
|
|
||||||
tmp->initdata = rmatch[i].init_data;
|
tmp->initdata = rmatch[i].init_data;
|
||||||
tmp->of_node = rmatch[i].of_node;
|
tmp->of_node = rmatch[i].of_node;
|
||||||
tmp->id = regulators[i].id;
|
tmp->id = regulators[i].id;
|
||||||
|
Loading…
Reference in New Issue
Block a user