diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:49 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-19 07:42:49 -0500 |
commit | e11c4515e3aca5bfc005fe0c6b3be6bbb1485807 (patch) | |
tree | 13b9de16168d118158cede45cd02f6d037ce0bb1 /drivers/regulator | |
parent | 6a244cadb00fa1abc31dcae6f771f4a7b9e86a1b (diff) | |
parent | c6163a70237bba13e9cdcf6a71e6c28875e7a734 (diff) |
Merge remote-tracking branch 'regulator/topic/max8998' into regulator-next
Diffstat (limited to 'drivers/regulator')
-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 0a8dd1cbee6f..b588f07c7cad 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, | |||
311 | dev_get_platdata(max8998->iodev->dev); | 311 | dev_get_platdata(max8998->iodev->dev); |
312 | struct i2c_client *i2c = max8998->iodev->i2c; | 312 | struct i2c_client *i2c = max8998->iodev->i2c; |
313 | int buck = rdev_get_id(rdev); | 313 | int buck = rdev_get_id(rdev); |
314 | int reg, shift = 0, mask, ret; | 314 | int reg, shift = 0, mask, ret, j; |
315 | int j, previous_sel; | ||
316 | static u8 buck1_last_val; | 315 | static u8 buck1_last_val; |
317 | 316 | ||
318 | ret = max8998_get_voltage_register(rdev, ®, &shift, &mask); | 317 | ret = max8998_get_voltage_register(rdev, ®, &shift, &mask); |
319 | if (ret) | 318 | if (ret) |
320 | return ret; | 319 | return ret; |
321 | 320 | ||
322 | previous_sel = max8998_get_voltage_sel(rdev); | ||
323 | |||
324 | /* Check if voltage needs to be changed */ | ||
325 | /* if previous_voltage equal new voltage, return */ | ||
326 | if (previous_sel == selector) { | ||
327 | dev_dbg(max8998->dev, "No voltage change, old:%d, new:%d\n", | ||
328 | regulator_list_voltage_linear(rdev, previous_sel), | ||
329 | regulator_list_voltage_linear(rdev, selector)); | ||
330 | return ret; | ||
331 | } | ||
332 | |||
333 | switch (buck) { | 321 | switch (buck) { |
334 | case MAX8998_BUCK1: | 322 | case MAX8998_BUCK1: |
335 | dev_dbg(max8998->dev, | 323 | dev_dbg(max8998->dev, |