Skip to contentSkip to conversation

regulator: isl6271a: Use regulator_list_voltage_linear for isl_fixed_ops

PATCH New Axel Lin 1 participant 1 message Jun 8, 2012 Voltage and current regulator framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 regulator: isl6271a: Use regulator_list_voltage_linear for isl_fixed_ops

---
This is v2 of
regulator: isl6271a: Use regulator_[list|map]_voltage_linear for isl_fixed_ops. I changed the subject line because map_voltage_linear is not used in this patch.

 drivers/regulator/isl6271a-regulator.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
drivers/regulator/isl6271a-regulator.c +4 -9
index 56d273f..1d145a0 100644
@@ -75,19 +75,12 @@ static struct regulator_ops isl_core_ops = {
 
 static int isl6271a_get_fixed_voltage(struct regulator_dev *dev)
 {
-	int id = rdev_get_id(dev);
-	return (id == 1) ? 1100000 : 1300000;
-}
-
-static int isl6271a_list_fixed_voltage(struct regulator_dev *dev, unsigned selector)
-{
-	int id = rdev_get_id(dev);
-	return (id == 1) ? 1100000 : 1300000;
+	return dev->desc->min_uV;
 }
 
 static struct regulator_ops isl_fixed_ops = {
 	.get_voltage	= isl6271a_get_fixed_voltage,
-	.list_voltage	= isl6271a_list_fixed_voltage,
+	.list_voltage	= regulator_list_voltage_linear,
 };
 
 static const struct regulator_desc isl_rd[] = {
@@ -107,6 +100,7 @@ static const struct regulator_desc isl_rd[] = {
 		.ops		= &isl_fixed_ops,
 		.type		= REGULATOR_VOLTAGE,
 		.owner		= THIS_MODULE,
+		.min_uV		= 1100000,
 	}, {
 		.name		= "LDO2",
 		.id		= 2,
@@ -114,6 +108,7 @@ static const struct regulator_desc isl_rd[] = {
 		.ops		= &isl_fixed_ops,
 		.type		= REGULATOR_VOLTAGE,
 		.owner		= THIS_MODULE,
+		.min_uV		= 1300000,
 	},
 };
 
Signature · 1 line
1.7.9.5