2012-05-17 05:06:30

by Axel Lin

[permalink] [raw]

Subject: [PATCH RFC/RFT] regulator: ab3100: Use regulator_map_voltage_iterate()

---

regulator_map_voltage_iterate() is for drivers implementing set_voltage_sel()
and list_voltage() to use it as their map_voltage() operation.

In this case, regulator_map_voltage_iterate() happen to be doing the same thing
as ab3100_get_best_voltage_index() function. So we can use it to replace
ab3100_get_best_voltage_index() function.


Signed-off-by: Axel Lin <[email protected]>
---
drivers/regulator/ab3100.c | 35 +----------------------------------
1 files changed, 1 insertions(+), 34 deletions(-)

diff --git a/drivers/regulator/ab3100.c b/drivers/regulator/ab3100.c
index e2062ad..03f4d9c 100644
--- a/drivers/regulator/ab3100.c
+++ b/drivers/regulator/ab3100.c
@@ -304,39 +304,6 @@ static int ab3100_get_voltage_regulator(struct regulator_dev *reg)
return abreg->typ_voltages[regval];
}

-static int ab3100_get_best_voltage_index(struct regulator_dev *reg,
- int min_uV, int max_uV)
-{
- struct ab3100_regulator *abreg = reg->reg_data;
- int i;
- int bestmatch;
- int bestindex;
-
- /*
- * Locate the minimum voltage fitting the criteria on
- * this regulator. The switchable voltages are not
- * in strict falling order so we need to check them
- * all for the best match.
- */
- bestmatch = INT_MAX;
- bestindex = -1;
- for (i = 0; i < abreg->voltages_len; i++) {
- if (abreg->typ_voltages[i] <= max_uV &&
- abreg->typ_voltages[i] >= min_uV &&
- abreg->typ_voltages[i] < bestmatch) {
- bestmatch = abreg->typ_voltages[i];
- bestindex = i;
- }
- }
-
- if (bestindex < 0) {
- dev_warn(&reg->dev, "requested %d<=x<=%d uV, out of range!\n",
- min_uV, max_uV);
- return -EINVAL;
- }
- return bestindex;
-}
-
static int ab3100_set_voltage_regulator_sel(struct regulator_dev *reg,
unsigned selector)
{
@@ -383,7 +350,7 @@ static int ab3100_set_suspend_voltage_regulator(struct regulator_dev *reg,
return -EINVAL;

/* LDO E and BUCK have special suspend voltages you can set */
- bestindex = ab3100_get_best_voltage_index(reg, uV, uV);
+ bestindex = regulator_map_voltage_iterate(reg, uV, uV);

err = abx500_get_register_interruptible(abreg->dev, 0,
targetreg, &regval);
--
1.7.5.4

2012-05-18 07:40:24

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH RFC/RFT] regulator: ab3100: Use regulator_map_voltage_iterate()

---

On Thu, May 17, 2012 at 01:06:18PM +0800, Axel Lin wrote:
> regulator_map_voltage_iterate() is for drivers implementing set_voltage_sel()
> and list_voltage() to use it as their map_voltage() operation.
>
> In this case, regulator_map_voltage_iterate() happen to be doing the same thing
> as ab3100_get_best_voltage_index() function. So we can use it to replace
> ab3100_get_best_voltage_index() function.

Applied, thanks.

---

Attachments:

(No filename) (425.00 B)
signature.asc (836.00 B)
Digital signature Download all attachments

2012-05-20 21:13:28

by Linus Walleij

[permalink] [raw]

Subject: Re: [PATCH RFC/RFT] regulator: ab3100: Use regulator_map_voltage_iterate()

---

On Thu, May 17, 2012 at 7:06 AM, Axel Lin <[email protected]> wrote:

> regulator_map_voltage_iterate() is for drivers implementing set_voltage_sel()
> and list_voltage() to use it as their map_voltage() operation.
>
> In this case, regulator_map_voltage_iterate() happen to be doing the same thing
> as ab3100_get_best_voltage_index() function. So we can use it to replace
> ab3100_get_best_voltage_index() function.
>
>
> Signed-off-by: Axel Lin <[email protected]>

Acked-by: Linus Walleij <[email protected]>

I think Mark already applied it too, great!

Linus Walleij