Merge remote-tracking branch 'regulator/topic/tps516312' into regulator-next

[pandora-kernel.git] / drivers / regulator / tps51632-regulator.c

diff --git a/drivers/regulator/tps51632-regulator.c b/drivers/regulator/tps51632-regulator.c
index dc7023e..ab21133 100644 (file)
--- a/drivers/regulator/tps51632-regulator.c
+++ b/drivers/regulator/tps51632-regulator.c
@@ -106,29 +106,23 @@ static int tps51632_dcdc_get_voltage_sel(struct regulator_dev *rdev)
        }
 
        vsel = data & TPS51632_VOUT_MASK;
-
-       if (vsel < TPS51632_MIN_VSEL)
-               return 0;
-       else
-               return vsel - TPS51632_MIN_VSEL;
+       return vsel;
 }
 
 static int tps51632_dcdc_set_voltage_sel(struct regulator_dev *rdev,
                unsigned selector)
 {
        struct tps51632_chip *tps = rdev_get_drvdata(rdev);
-       int vsel;
        int ret;
        unsigned int reg = TPS51632_VOLTAGE_SELECT_REG;
 
        if (tps->enable_pwm_dvfs)
                reg = TPS51632_VOLTAGE_BASE_REG;
 
-       vsel = selector + TPS51632_MIN_VSEL;
-       if (vsel > TPS51632_MAX_VSEL)
+       if (selector > TPS51632_MAX_VSEL)
                return -EINVAL;
 
-       ret = regmap_write(tps->regmap, reg, vsel);
+       ret = regmap_write(tps->regmap, reg, selector);
        if (ret < 0)
                dev_err(tps->dev, "reg write failed, err %d\n", ret);
        return ret;
@@ -157,7 +151,7 @@ static struct regulator_ops tps51632_dcdc_ops = {
        .set_ramp_delay         = tps51632_dcdc_set_ramp_delay,
 };
 
-static int __devinit tps51632_init_dcdc(struct tps51632_chip *tps,
+static int tps51632_init_dcdc(struct tps51632_chip *tps,
                struct tps51632_regulator_platform_data *pdata)
 {
        int ret;
@@ -227,7 +221,7 @@ static const struct regmap_config tps51632_regmap_config = {
        .cache_type             = REGCACHE_RBTREE,
 };
 
-static int __devinit tps51632_probe(struct i2c_client *client,
+static int tps51632_probe(struct i2c_client *client,
                                const struct i2c_device_id *id)
 {
        struct tps51632_regulator_platform_data *pdata;
@@ -269,7 +263,8 @@ static int __devinit tps51632_probe(struct i2c_client *client,
        tps->desc.ramp_delay = TPS51632_DEFAULT_RAMP_DELAY;
        tps->desc.min_uV = TPS51632_MIN_VOLATGE;
        tps->desc.uV_step = TPS51632_VOLATGE_STEP_10mV;
-       tps->desc.n_voltages = (TPS51632_MAX_VSEL - TPS51632_MIN_VSEL) + 1;
+       tps->desc.linear_min_sel = TPS51632_MIN_VSEL;
+       tps->desc.n_voltages = TPS51632_MAX_VSEL + 1;
        tps->desc.ops = &tps51632_dcdc_ops;
        tps->desc.type = REGULATOR_VOLTAGE;
        tps->desc.owner = THIS_MODULE;
@@ -305,7 +300,7 @@ static int __devinit tps51632_probe(struct i2c_client *client,
        return 0;
 }
 
-static int __devexit tps51632_remove(struct i2c_client *client)
+static int tps51632_remove(struct i2c_client *client)
 {
        struct tps51632_chip *tps = i2c_get_clientdata(client);
 
@@ -326,7 +321,7 @@ static struct i2c_driver tps51632_i2c_driver = {
                .owner = THIS_MODULE,
        },
        .probe = tps51632_probe,
-       .remove = __devexit_p(tps51632_remove),
+       .remove = tps51632_remove,
        .id_table = tps51632_id,
 };