Skip to contentSkip to conversation

regulator: tps65910: Set enable enable_time in regulator_desc

PATCH Applied Axel Lin 3 participants 3 messages Jul 4, 2012

Subsystems (2)
OMAP2+ support Voltage and current regulator framework
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 regulator: tps65910: Set enable enable_time in regulator_desc

Signed-off-by Axel Lin <[email protected]>
---
 drivers/regulator/tps65910-regulator.c |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/regulator/tps65910-regulator.c +1 -11
index 66da87c..a534e087 100644
@@ -412,13 +412,6 @@ static int tps65911_get_ctrl_register(int id)
 	}
 }
 
-static int tps65910_enable_time(struct regulator_dev *dev)
-{
-	struct tps65910_reg *pmic = rdev_get_drvdata(dev);
-	int id = rdev_get_id(dev);
-	return pmic->info[id]->enable_time_us;
-}
-
 static int tps65910_set_mode(struct regulator_dev *dev, unsigned int mode)
 {
 	struct tps65910_reg *pmic = rdev_get_drvdata(dev);

@@ -762,7 +755,6 @@ static struct regulator_ops tps65910_ops_dcdc = {
 	.is_enabled		= regulator_is_enabled_regmap,
 	.enable			= regulator_enable_regmap,
 	.disable		= regulator_disable_regmap,
-	.enable_time		= tps65910_enable_time,
 	.set_mode		= tps65910_set_mode,
 	.get_mode		= tps65910_get_mode,
 	.get_voltage_sel	= tps65910_get_voltage_dcdc_sel,

@@ -775,7 +767,6 @@ static struct regulator_ops tps65910_ops_vdd3 = {
 	.is_enabled		= regulator_is_enabled_regmap,
 	.enable			= regulator_enable_regmap,
 	.disable		= regulator_disable_regmap,
-	.enable_time		= tps65910_enable_time,
 	.set_mode		= tps65910_set_mode,
 	.get_mode		= tps65910_get_mode,
 	.get_voltage		= tps65910_get_voltage_vdd3,

@@ -786,7 +777,6 @@ static struct regulator_ops tps65910_ops = {
 	.is_enabled		= regulator_is_enabled_regmap,
 	.enable			= regulator_enable_regmap,
 	.disable		= regulator_disable_regmap,
-	.enable_time		= tps65910_enable_time,
 	.set_mode		= tps65910_set_mode,
 	.get_mode		= tps65910_get_mode,
 	.get_voltage_sel	= tps65910_get_voltage_sel,

@@ -798,7 +788,6 @@ static struct regulator_ops tps65911_ops = {
 	.is_enabled		= regulator_is_enabled_regmap,
 	.enable			= regulator_enable_regmap,
 	.disable		= regulator_disable_regmap,
-	.enable_time		= tps65910_enable_time,
 	.set_mode		= tps65910_set_mode,
 	.get_mode		= tps65910_get_mode,
 	.get_voltage_sel	= tps65911_get_voltage_sel,

@@ -1139,6 +1128,7 @@ static __devinit int tps65910_probe(struct platform_device *pdev)
 		pmic->desc[i].name = info->name;
 		pmic->desc[i].id = i;
 		pmic->desc[i].n_voltages = info->n_voltages;
+		pmic->desc[i].enable_time = info->enable_time_us;
 
 		if (i == TPS65910_REG_VDD1 || i == TPS65910_REG_VDD2) {
 			pmic->desc[i].ops = &tps65910_ops_dcdc;
Signature · 1 line
1.7.9.5
Acked-by on v1 1/1
#1 lore raw

drivers/regulator/tps65910-regulator.c static int tps65911_get_ctrl_register(int id) · line 413

Quoted 12 lines · Axel Lin
Signed-off-by Axel Lin<[email protected]>
---
  drivers/regulator/tps65910-regulator.c |   12 +-----------
  1 file changed, 1 insertion(+), 11 deletions(-)
drivers/regulator/tps65910-regulator.c +0 -0
index 66da87c..a534e087 100644
@@ -412,13 +412,6 @@ static int tps65911_get_ctrl_register(int id)
  	}
  }
Acked-by Laxman Dewangan <[email protected]>

Looks good to me.