1 files changed, 8 insertions, 10 deletions

diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 49b2112b0486..3660bace123c 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -47,7 +47,7 @@ static int anatop_set_voltage(struct regulator_dev *reg, int min_uV,
                                   int max_uV, unsigned *selector)
 {
         struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);
-        u32 val, sel;
+        u32 val, sel, mask;
         int uv;
 
         uv = min_uV;
@@ -71,11 +71,10 @@ static int anatop_set_voltage(struct regulator_dev *reg, int min_uV,
         val = anatop_reg->min_bit_val + sel;
         *selector = sel;
         dev_dbg(&reg->dev, "%s: calculated val %d\n", __func__, val);
-        anatop_set_bits(anatop_reg->mfd,
-                        anatop_reg->control_reg,
-                        anatop_reg->vol_bit_shift,
-                        anatop_reg->vol_bit_width,
-                        val);
+        mask = ((1 << anatop_reg->vol_bit_width) - 1) <<
+                anatop_reg->vol_bit_shift;
+        val <<= anatop_reg->vol_bit_shift;
+        anatop_write_reg(anatop_reg->mfd, anatop_reg->control_reg, val, mask);
 
         return 0;
 }
@@ -88,10 +87,9 @@ static int anatop_get_voltage_sel(struct regulator_dev *reg)
         if (!anatop_reg->control_reg)
                 return -ENOTSUPP;
 
-        val = anatop_get_bits(anatop_reg->mfd,
-                              anatop_reg->control_reg,
-                              anatop_reg->vol_bit_shift,
-                              anatop_reg->vol_bit_width);
+        val = anatop_read_reg(anatop_reg->mfd, anatop_reg->control_reg);
+        val = (val & ((1 << anatop_reg->vol_bit_width) - 1)) >>
+                anatop_reg->vol_bit_shift;
 
         return val - anatop_reg->min_bit_val;
 }