Skip to content

Commit

Permalink
regulator: da903x: Use DIV_ROUND_UP macro to calculate selector
Browse files Browse the repository at this point in the history 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Mar 11, 2012
1 parent e9a15c8 commit ae76e83
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/regulator/da903x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static int da903x_set_ldo_voltage(struct regulator_dev *rdev,
return -EINVAL;
}

val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
*selector = val;
val <<= info->vol_shift;
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
Expand Down Expand Up @@ -202,7 +202,7 @@ static int da9030_set_ldo1_15_voltage(struct regulator_dev *rdev,
return -EINVAL;
}

val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
*selector = val;
val <<= info->vol_shift;
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
Expand Down Expand Up @@ -233,10 +233,10 @@ static int da9030_set_ldo14_voltage(struct regulator_dev *rdev,

thresh = (info->max_uV + info->min_uV) / 2;
if (min_uV < thresh) {
val = (thresh - min_uV + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(thresh - min_uV, info->step_uV);
val |= 0x4;
} else {
val = (min_uV - thresh + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(min_uV - thresh, info->step_uV);
}

*selector = val;
Expand Down Expand Up @@ -281,7 +281,7 @@ static int da9034_set_dvc_voltage(struct regulator_dev *rdev,
return -EINVAL;
}

val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
*selector = val;
val <<= info->vol_shift;
mask = ((1 << info->vol_nbits) - 1) << info->vol_shift;
Expand All @@ -307,7 +307,7 @@ static int da9034_set_ldo12_voltage(struct regulator_dev *rdev,
return -EINVAL;
}

val = (min_uV - info->min_uV + info->step_uV - 1) / info->step_uV;
val = DIV_ROUND_UP(min_uV - info->min_uV, info->step_uV);
val = (val >= 20) ? val - 12 : ((val > 7) ? 8 : val);
*selector = val;
val <<= info->vol_shift;
Expand Down

0 comments on commit ae76e83

Please sign in to comment.