Merge remote-tracking branch 'asoc/fix/dapm' into asoc-next

[karo-tx-linux.git] / drivers / regulator / max8998.c

diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
index 0a8dd1cbee6fffa705b5a1bd1aa7528301ca9b96..b588f07c7cad20b9d1f8f47ce03d4f9333d3e44b 100644 (file)
--- 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, &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,