lkml.org 
[lkml]   [2012]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] regulator: Simplify regulator_bulk_get and regulator_bulk_enable error paths
From
Date
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>
---
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 fecda41..37a84df 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2451,7 +2451,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;
@@ -2547,12 +2547,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;
}
--
1.7.5.4




\
 
 \ /
  Last update: 2012-02-20 03:35    [W:0.021 / U:2.188 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site