[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1337011930.13224.1.camel@phoenix>
Date: Tue, 15 May 2012 00:12:10 +0800
From: Axel Lin <axel.lin@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Jonghwan Choi <jhbird.choi@...il.com>,
Haojian Zhuang <haojian.zhuang@...vell.com>,
Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Liam Girdwood <lrg@...com>
Subject: [PATCH 1/4] regulator: max8649: Convert to get_voltage_sel
Signed-off-by: Axel Lin <axel.lin@...il.com>
---
drivers/regulator/max8649.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c
index 4ce7208..3b73a7f 100644
--- a/drivers/regulator/max8649.c
+++ b/drivers/regulator/max8649.c
@@ -76,7 +76,7 @@ static int max8649_list_voltage(struct regulator_dev *rdev, unsigned index)
return (MAX8649_DCDC_VMIN + index * MAX8649_DCDC_STEP);
}
-static int max8649_get_voltage(struct regulator_dev *rdev)
+static int max8649_get_voltage_sel(struct regulator_dev *rdev)
{
struct max8649_regulator_info *info = rdev_get_drvdata(rdev);
unsigned int val;
@@ -87,7 +87,7 @@ static int max8649_get_voltage(struct regulator_dev *rdev)
if (ret != 0)
return ret;
data = (unsigned char)val & MAX8649_VOL_MASK;
- return max8649_list_voltage(rdev, data);
+ return data;
}
static int max8649_set_voltage(struct regulator_dev *rdev,
@@ -196,7 +196,7 @@ static unsigned int max8649_get_mode(struct regulator_dev *rdev)
static struct regulator_ops max8649_dcdc_ops = {
.set_voltage = max8649_set_voltage,
- .get_voltage = max8649_get_voltage,
+ .get_voltage_sel = max8649_get_voltage_sel,
.list_voltage = max8649_list_voltage,
.enable = max8649_enable,
.disable = max8649_disable,
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists