From d9782e16c6fc721713af7bdc4d987e12adf9991a Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 24 Feb 2012 14:52:45 +0800 Subject: [PATCH] --- yaml --- r: 292035 b: refs/heads/master c: 89e0f0e40002e0d95b7be079fa2c2133304ce09f h: refs/heads/master i: 292033: 138a4b176f706990f4b63cdf6baae027f7f3dbb8 292031: 7e1c100d77610f94bfa0a6d4aa8caee16029571c v: v3 --- [refs] | 2 +- trunk/drivers/regulator/s5m8767.c | 30 ++---------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 3d1da8a20447..c70e3b7ab7bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0757b6020f5aaa9f770068ca0396c0ea5cb0740d +refs/heads/master: 89e0f0e40002e0d95b7be079fa2c2133304ce09f diff --git a/trunk/drivers/regulator/s5m8767.c b/trunk/drivers/regulator/s5m8767.c index 2fb2adddd482..9b97aa36b7cc 100644 --- a/trunk/drivers/regulator/s5m8767.c +++ b/trunk/drivers/regulator/s5m8767.c @@ -452,39 +452,13 @@ static int s5m8767_set_voltage_time_sel(struct regulator_dev *rdev, struct s5m8767_info *s5m8767 = rdev_get_drvdata(rdev); const struct s5m_voltage_desc *desc; int reg_id = rdev_get_id(rdev); - int mask; - int new_val, old_val; - switch (reg_id) { - case S5M8767_LDO1 ... S5M8767_LDO28: - mask = 0x3f; - break; - case S5M8767_BUCK1 ... S5M8767_BUCK6: - mask = 0xff; - break; - case S5M8767_BUCK7 ... S5M8767_BUCK8: - return -EINVAL; - case S5M8767_BUCK9: - mask = 0xff; - break; - default: - return -EINVAL; - } desc = reg_voltage_map[reg_id]; - new_val = s5m8767_convert_voltage(desc, new_sel, new_sel); - if (new_val < 0) - return new_val; - - old_val = s5m8767_convert_voltage(desc, old_sel, old_sel); - if (old_val < 0) - return old_val; - if (old_sel < new_sel) - return DIV_ROUND_UP(desc->step * (new_val - old_val), + return DIV_ROUND_UP(desc->step * (new_sel - old_sel), s5m8767->ramp_delay); - else - return 0; + return 0; } static struct regulator_ops s5m8767_ldo_ops = {