Skip to content

Commit

Permalink
Merge remote-tracking branch 'regulator/topic/max8998' into regulator…
Browse files Browse the repository at this point in the history
…-next
  • Loading branch information
broonie committed Feb 19, 2013
2 parents 6a244ca + c6163a7 commit e11c451
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions drivers/regulator/max8998.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,25 +311,13 @@ static int max8998_set_voltage_buck_sel(struct regulator_dev *rdev,
dev_get_platdata(max8998->iodev->dev);
struct i2c_client *i2c = max8998->iodev->i2c;
int buck = rdev_get_id(rdev);
int reg, shift = 0, mask, ret;
int j, previous_sel;
int reg, shift = 0, mask, ret, j;
static u8 buck1_last_val;

ret = max8998_get_voltage_register(rdev, &reg, &shift, &mask);
if (ret)
return ret;

previous_sel = max8998_get_voltage_sel(rdev);

/* Check if voltage needs to be changed */
/* if previous_voltage equal new voltage, return */
if (previous_sel == selector) {
dev_dbg(max8998->dev, "No voltage change, old:%d, new:%d\n",
regulator_list_voltage_linear(rdev, previous_sel),
regulator_list_voltage_linear(rdev, selector));
return ret;
}

switch (buck) {
case MAX8998_BUCK1:
dev_dbg(max8998->dev,
Expand Down

0 comments on commit e11c451

Please sign in to comment.