Skip to content

Commit

Permalink
regulator: Convert tps6524x to get_voltage_sel
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Apr 1, 2012
1 parent f8ee339 commit 4af7c1d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/regulator/tps6524x-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ static int set_voltage_sel(struct regulator_dev *rdev, unsigned selector)
return write_field(hw, &info->voltage, selector);
}

static int get_voltage(struct regulator_dev *rdev)
static int get_voltage_sel(struct regulator_dev *rdev)
{
const struct supply_info *info;
struct tps6524x *hw;
Expand All @@ -490,7 +490,7 @@ static int get_voltage(struct regulator_dev *rdev)
if (WARN_ON(ret >= info->n_voltages))
return -EIO;

return info->voltages[ret];
return ret;
}

static int set_current_limit(struct regulator_dev *rdev, int min_uA,
Expand Down Expand Up @@ -575,7 +575,7 @@ static struct regulator_ops regulator_ops = {
.is_enabled = is_supply_enabled,
.enable = enable_supply,
.disable = disable_supply,
.get_voltage = get_voltage,
.get_voltage_sel = get_voltage_sel,
.set_voltage_sel = set_voltage_sel,
.list_voltage = list_voltage,
.set_current_limit = set_current_limit,
Expand Down

0 comments on commit 4af7c1d

Please sign in to comment.