From 003a6a3eb18974f4fa7db26095a0c6f8a31cf6dd Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Tue, 6 Mar 2012 09:54:22 +0800 Subject: [PATCH] --- yaml --- r: 292047 b: refs/heads/master c: 2fe4e0259dfd6d66f2a094b5109f11f8d253e764 h: refs/heads/master i: 292045: f1e82a8dc0ef382cde05bb12444a4c44610c23b5 292043: 04ee622b94fe38e42bd9dc746dae72c68504c525 292039: 361e6e9246d2b7f13dc57d11e0589cc6cafb50bd 292031: 7e1c100d77610f94bfa0a6d4aa8caee16029571c v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps65217-regulator.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 4b774ea49c3b..71926da551a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae76e8307ff2812a57692a54322c6898a949ae76 +refs/heads/master: 2fe4e0259dfd6d66f2a094b5109f11f8d253e764 diff --git a/trunk/drivers/regulator/tps65217-regulator.c b/trunk/drivers/regulator/tps65217-regulator.c index 28a10eaeda17..15f2fa0bb005 100644 --- a/trunk/drivers/regulator/tps65217-regulator.c +++ b/trunk/drivers/regulator/tps65217-regulator.c @@ -82,11 +82,11 @@ static int tps65217_uv_to_vsel1(int uV, unsigned int *vsel) return -EINVAL; if (uV <= 1500000) - *vsel = (uV - 875001) / 25000; + *vsel = DIV_ROUND_UP(uV - 900000, 25000); else if (uV <= 2900000) - *vsel = 24 + (uV - 1450001) / 50000; + *vsel = 24 + DIV_ROUND_UP(uV - 1500000, 50000); else if (uV < 3300000) - *vsel = 52 + (uV - 2800001) / 100000; + *vsel = 52 + DIV_ROUND_UP(uV - 2900000, 100000); else *vsel = 56; @@ -116,11 +116,11 @@ static int tps65217_uv_to_vsel2(int uV, unsigned int *vsel) return -EINVAL; if (uV <= 1900000) - *vsel = (uV - 1450001) / 50000; + *vsel = DIV_ROUND_UP(uV - 1500000, 50000); else if (uV <= 2400000) - *vsel = 8 + (uV - 1800001) / 100000; + *vsel = 8 + DIV_ROUND_UP(uV - 1900000, 100000); else - *vsel = 13 + (uV - 2350001) / 50000; + *vsel = 13 + DIV_ROUND_UP(uV - 2400000, 50000); return 0; }