From d971aa5e03f915dcd8c4dac8b03d37b4d2559001 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sat, 21 Apr 2012 11:03:34 +0800 Subject: [PATCH] --- yaml --- r: 302250 b: refs/heads/master c: 9db7f05624ffa845400d2bd2bfe5b9793985ce34 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps65912-regulator.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3a29485b8518..85fe3b142aae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f80ea1499ae047dcaa29ccecfe0d58bb229c4e9 +refs/heads/master: 9db7f05624ffa845400d2bd2bfe5b9793985ce34 diff --git a/trunk/drivers/regulator/tps65912-regulator.c b/trunk/drivers/regulator/tps65912-regulator.c index 7312e3624f57..18b2a1dcb4b5 100644 --- a/trunk/drivers/regulator/tps65912-regulator.c +++ b/trunk/drivers/regulator/tps65912-regulator.c @@ -405,7 +405,7 @@ static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector) return voltage; } -static int tps65912_get_voltage(struct regulator_dev *dev) +static int tps65912_get_voltage_sel(struct regulator_dev *dev) { struct tps65912_reg *pmic = rdev_get_drvdata(dev); struct tps65912 *mfd = pmic->mfd; @@ -419,7 +419,7 @@ static int tps65912_get_voltage(struct regulator_dev *dev) vsel = tps65912_reg_read(mfd, reg); vsel &= 0x3F; - return tps65912_list_voltage(dev, vsel); + return vsel; } static int tps65912_set_voltage_sel(struct regulator_dev *dev, @@ -444,7 +444,7 @@ static struct regulator_ops tps65912_ops_dcdc = { .disable = tps65912_reg_disable, .set_mode = tps65912_set_mode, .get_mode = tps65912_get_mode, - .get_voltage = tps65912_get_voltage, + .get_voltage_sel = tps65912_get_voltage_sel, .set_voltage_sel = tps65912_set_voltage_sel, .list_voltage = tps65912_list_voltage, }; @@ -454,7 +454,7 @@ static struct regulator_ops tps65912_ops_ldo = { .is_enabled = tps65912_reg_is_enabled, .enable = tps65912_reg_enable, .disable = tps65912_reg_disable, - .get_voltage = tps65912_get_voltage, + .get_voltage_sel = tps65912_get_voltage_sel, .set_voltage_sel = tps65912_set_voltage_sel, .list_voltage = tps65912_list_voltage, };