regulator: s2mps11: Don't check enable_shift before setting enable ramp rate

Current code misses updating the register when enable_shift is 0. e.g. S2MPS11_BUCK9_RAMP_SHIFT and S2MPS11_BUCK6_RAMP_EN_SHIFT are 0. Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>

regulator: s2mps11: Don't check enable_shift before setting enable ramp rate
Current code misses updating the register when enable_shift is 0. e.g. S2MPS11_BUCK9_RAMP_SHIFT and S2MPS11_BUCK6_RAMP_EN_SHIFT are 0. Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Axel Lin · Mark Brown · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent f7b1a8dc1c
Showing 1 changed file with 5 additions and 7 deletions Side-by-side Diff
drivers/regulator/s2mps11.c
@@ -202,13 +202,11 @@
 	if (!ramp_enable)
 		goto ramp_disable;
  
-	if (enable_shift) {
-		ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
-					1 << enable_shift, 1 << enable_shift);
-		if (ret) {
-			dev_err(&rdev->dev, "failed to enable ramp rate\n");
-			return ret;
-		}
+	ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
+				 1 << enable_shift, 1 << enable_shift);
+	if (ret) {
+		dev_err(&rdev->dev, "failed to enable ramp rate\n");
+		return ret;
 	}
  
 	ramp_val = get_ramp_delay(ramp_delay);
...	...	@@ -202,13 +202,11 @@
202	202	if (!ramp_enable)
203	203	goto ramp_disable;
204	204
205		- if (enable_shift) {
206		- ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
207		- 1 << enable_shift, 1 << enable_shift);
208		- if (ret) {
209		- dev_err(&rdev->dev, "failed to enable ramp rate\n");
210		- return ret;
211		- }
	205	+ ret = regmap_update_bits(rdev->regmap, S2MPS11_REG_RAMP,
	206	+ 1 << enable_shift, 1 << enable_shift);
	207	+ if (ret) {
	208	+ dev_err(&rdev->dev, "failed to enable ramp rate\n");
	209	+ return ret;
212	210	}
213	211
214	212	ramp_val = get_ramp_delay(ramp_delay);