lkml.org 
[lkml]   [2012]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] regulator: Use tps65912_get_voltage for both DCDCs and LDOs
    From
    Date
    Now tps65912_get_voltage_dcdc and tps65912_get_voltage_ldo has exactly the same
    implementation. We can merge them to tps65912_get_voltage function.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/tps65912-regulator.c | 21 +++------------------
    1 files changed, 3 insertions(+), 18 deletions(-)

    diff --git a/drivers/regulator/tps65912-regulator.c b/drivers/regulator/tps65912-regulator.c
    index 46f3c61..05ea096 100644
    --- a/drivers/regulator/tps65912-regulator.c
    +++ b/drivers/regulator/tps65912-regulator.c
    @@ -406,7 +406,7 @@ static int tps65912_list_voltage(struct regulator_dev *dev, unsigned selector)
    return voltage;
    }

    -static int tps65912_get_voltage_dcdc(struct regulator_dev *dev)
    +static int tps65912_get_voltage(struct regulator_dev *dev)
    {
    struct tps65912_reg *pmic = rdev_get_drvdata(dev);
    struct tps65912 *mfd = pmic->mfd;
    @@ -438,21 +438,6 @@ static int tps65912_set_voltage_sel(struct regulator_dev *dev,
    return tps65912_reg_write(mfd, reg, selector | value);
    }

    -static int tps65912_get_voltage_ldo(struct regulator_dev *dev)
    -{
    - struct tps65912_reg *pmic = rdev_get_drvdata(dev);
    - struct tps65912 *mfd = pmic->mfd;
    - int id = rdev_get_id(dev);
    - int vsel = 0;
    - u8 reg;
    -
    - reg = tps65912_get_sel_register(pmic, id);
    - vsel = tps65912_reg_read(mfd, reg);
    - vsel &= 0x3F;
    -
    - return tps65912_vsel_to_uv_ldo(vsel);
    -}
    -
    /* Operations permitted on DCDCx */
    static struct regulator_ops tps65912_ops_dcdc = {
    .is_enabled = tps65912_reg_is_enabled,
    @@ -460,7 +445,7 @@ static struct regulator_ops tps65912_ops_dcdc = {
    .disable = tps65912_reg_disable,
    .set_mode = tps65912_set_mode,
    .get_mode = tps65912_get_mode,
    - .get_voltage = tps65912_get_voltage_dcdc,
    + .get_voltage = tps65912_get_voltage,
    .set_voltage_sel = tps65912_set_voltage_sel,
    .list_voltage = tps65912_list_voltage,
    };
    @@ -470,7 +455,7 @@ static struct regulator_ops tps65912_ops_ldo = {
    .is_enabled = tps65912_reg_is_enabled,
    .enable = tps65912_reg_enable,
    .disable = tps65912_reg_disable,
    - .get_voltage = tps65912_get_voltage_ldo,
    + .get_voltage = tps65912_get_voltage,
    .set_voltage_sel = tps65912_set_voltage_sel,
    .list_voltage = tps65912_list_voltage,
    };
    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-03-15 10:21    [W:0.023 / U:187.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site