From 3da2a63ffac175871f5c323da62633d74c6c1f55 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 7 Jun 2012 16:38:09 +0800 Subject: [PATCH] --- yaml --- r: 312519 b: refs/heads/master c: 1acb645ebfe3a008e3c3350918d7d29974b1eaec h: refs/heads/master i: 312517: e6fd41b972aa76033ee39e3a17f578f8de0a12e7 312515: 7a00aaa9fa7eeb01eb8095420c6150ea78ff8717 312511: 663a7a10f961c4fca531f4a61d76870609ac9c7b v: v3 --- [refs] | 2 +- trunk/drivers/regulator/rc5t583-regulator.c | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 78b360a0fa96..e82e1b7fcf21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee3ed6effd8cc4c0cbfa35307cfc5fcec75b5e12 +refs/heads/master: 1acb645ebfe3a008e3c3350918d7d29974b1eaec diff --git a/trunk/drivers/regulator/rc5t583-regulator.c b/trunk/drivers/regulator/rc5t583-regulator.c index 1d34e64a1307..332eae897dab 100644 --- a/trunk/drivers/regulator/rc5t583-regulator.c +++ b/trunk/drivers/regulator/rc5t583-regulator.c @@ -70,18 +70,10 @@ static int rc5t583_set_voltage_time_sel(struct regulator_dev *rdev, unsigned int old_selector, unsigned int new_selector) { struct rc5t583_regulator *reg = rdev_get_drvdata(rdev); - int old_uV, new_uV; - old_uV = regulator_list_voltage_linear(rdev, old_selector); - if (old_uV < 0) - return old_uV; - - new_uV = regulator_list_voltage_linear(rdev, new_selector); - if (new_uV < 0) - return new_uV; - - return DIV_ROUND_UP(abs(old_uV - new_uV), - reg->reg_info->change_uv_per_us); + return DIV_ROUND_UP(abs(new_selector - old_selector) * + rdev->desc->uV_step, + reg->reg_info->change_uv_per_us); }