diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 12:42:49 +0000 |
| commit | e11c4515e3aca5bfc005fe0c6b3be6bbb1485807 (patch) | |
| tree | 13b9de16168d118158cede45cd02f6d037ce0bb1 | |
| parent | 6a244cadb00fa1abc31dcae6f771f4a7b9e86a1b (diff) | |
| parent | c6163a70237bba13e9cdcf6a71e6c28875e7a734 (diff) | |
| download | olio-linux-3.10-e11c4515e3aca5bfc005fe0c6b3be6bbb1485807.tar.xz olio-linux-3.10-e11c4515e3aca5bfc005fe0c6b3be6bbb1485807.zip | |
Merge remote-tracking branch 'regulator/topic/max8998' into regulator-next
| -rw-r--r-- | drivers/regulator/max8998.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index 0a8dd1cbee6..b588f07c7ca 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c @@ -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, ®, &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, |