From: Axel Lin Date: Mon, 14 May 2012 16:12:10 +0000 (+0800) Subject: regulator: max8649: Convert to get_voltage_sel X-Git-Tag: v3.5-rc1~177^2~35 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0f65402b2593cae129dcdb67f6ad79d5dc2ac017;p=~emulex%2Finfiniband.git regulator: max8649: Convert to get_voltage_sel Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 4ce72081c2e..3b73a7f4aed 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,