From b7e94960ef1ebcbad6121c28e12bbd2ce1c3a7b9 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 16 May 2012 10:11:13 +0800 Subject: [PATCH] --- yaml --- r: 302303 b: refs/heads/master c: dde2b724e6bd6a6ea8516345398d3b8fe06a031b h: refs/heads/master i: 302301: 32aba203291d07d22379b10adf489820992a3b34 302299: 03895d9200c2b4579e02485f4d72c8eb6eb746eb 302295: 9c35fe8a845540a4850c10ad4ed5219ce28dcebb 302287: c70fdd8736f6eabc0be70b3022f163ecf4f782e0 302271: c074861dfad2a8fc4da1c194deaa21bdcf5da2a3 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/isl6271a-regulator.c | 21 ++++++-------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 94380811ccfc..709d50ff9be1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9b2899b9deeae0f83a1a1f5761ee8d2fd7824cd +refs/heads/master: dde2b724e6bd6a6ea8516345398d3b8fe06a031b diff --git a/trunk/drivers/regulator/isl6271a-regulator.c b/trunk/drivers/regulator/isl6271a-regulator.c index 00cb28816725..56d273f25603 100644 --- a/trunk/drivers/regulator/isl6271a-regulator.c +++ b/trunk/drivers/regulator/isl6271a-regulator.c @@ -50,25 +50,15 @@ static int isl6271a_get_voltage_sel(struct regulator_dev *dev) return idx; } -static int isl6271a_set_voltage(struct regulator_dev *dev, - int minuV, int maxuV, - unsigned *selector) +static int isl6271a_set_voltage_sel(struct regulator_dev *dev, + unsigned selector) { struct isl_pmic *pmic = rdev_get_drvdata(dev); - int err, data; - - if (minuV < ISL6271A_VOLTAGE_MIN || minuV > ISL6271A_VOLTAGE_MAX) - return -EINVAL; - if (maxuV < ISL6271A_VOLTAGE_MIN || maxuV > ISL6271A_VOLTAGE_MAX) - return -EINVAL; - - data = DIV_ROUND_UP(minuV - ISL6271A_VOLTAGE_MIN, - ISL6271A_VOLTAGE_STEP); - *selector = data; + int err; mutex_lock(&pmic->mtx); - err = i2c_smbus_write_byte(pmic->client, data); + err = i2c_smbus_write_byte(pmic->client, selector); if (err < 0) dev_err(&pmic->client->dev, "Error setting voltage\n"); @@ -78,8 +68,9 @@ static int isl6271a_set_voltage(struct regulator_dev *dev, static struct regulator_ops isl_core_ops = { .get_voltage_sel = isl6271a_get_voltage_sel, - .set_voltage = isl6271a_set_voltage, + .set_voltage_sel = isl6271a_set_voltage_sel, .list_voltage = regulator_list_voltage_linear, + .map_voltage = regulator_map_voltage_linear, }; static int isl6271a_get_fixed_voltage(struct regulator_dev *dev)