Commit e11c4515e3aca5bfc005fe0c6b3be6bbb1485807

Authored by Mark Brown

Merge remote-tracking branch 'regulator/topic/max8998' into regulator-next

Showing 1 changed file Side-by-side Diff

drivers/regulator/max8998.c
... ... @@ -311,24 +311,12 @@
311 311 dev_get_platdata(max8998->iodev->dev);
312 312 struct i2c_client *i2c = max8998->iodev->i2c;
313 313 int buck = rdev_get_id(rdev);
314   - int reg, shift = 0, mask, ret;
315   - int j, previous_sel;
  314 + int reg, shift = 0, mask, ret, j;
316 315 static u8 buck1_last_val;
317 316  
318 317 ret = max8998_get_voltage_register(rdev, &reg, &shift, &mask);
319 318 if (ret)
320 319 return ret;
321   -
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 320  
333 321 switch (buck) {
334 322 case MAX8998_BUCK1: