diff options
| author | Axel Lin <axel.lin@gmail.com> | 2012-02-20 06:32:16 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-20 06:50:21 +0400 |
| commit | b29c7690a764b9829b1034f873f97b7bbfa19565 (patch) | |
| tree | d77789334e777bb67a429f0a69024cec4bb64906 /drivers/regulator/core.c | |
| parent | fde297bb4d8075229b8985e9d4f96d32339a8e68 (diff) | |
| download | linux-b29c7690a764b9829b1034f873f97b7bbfa19565.tar.xz | |
regulator: Simplify regulator_bulk_get and regulator_bulk_enable error paths
Start unwind from the point the error happens instead of iterating over all
consumers, then unwind code can be simpler.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/core.c')
| -rw-r--r-- | drivers/regulator/core.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 9a143aebb84b..6c845200a530 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2397,7 +2397,7 @@ int regulator_bulk_get(struct device *dev, int num_consumers, return 0; err: - for (i = 0; i < num_consumers && consumers[i].consumer; i++) + while (--i >= 0) regulator_put(consumers[i].consumer); return ret; @@ -2447,12 +2447,9 @@ int regulator_bulk_enable(int num_consumers, return 0; err: - for (i = 0; i < num_consumers; i++) - if (consumers[i].ret == 0) - regulator_disable(consumers[i].consumer); - else - pr_err("Failed to enable %s: %d\n", - consumers[i].supply, consumers[i].ret); + pr_err("Failed to enable %s: %d\n", consumers[i].supply, ret); + while (--i >= 0) + regulator_disable(consumers[i].consumer); return ret; } |