lkml.org 
[lkml]   [2012]   [Mar]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v3 2/2] regulator: Convert pcf50633 to get_voltage_sel
    From
    Date
    Convert pcf50633 to get_voltage_sel and then we can remove
    pcf50633_regulator_voltage_value function and move its implementation
    to pcf50633_regulator_list_voltage.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/pcf50633-regulator.c | 62 ++++++++++++++------------------
    1 files changed, 27 insertions(+), 35 deletions(-)

    diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
    index c05b5d1..b62f4c8 100644
    --- a/drivers/regulator/pcf50633-regulator.c
    +++ b/drivers/regulator/pcf50633-regulator.c
    @@ -157,20 +157,39 @@ static int pcf50633_regulator_set_voltage(struct regulator_dev *rdev,
    return pcf50633_reg_write(pcf, regnr, volt_bits);
    }

    -static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id,
    - u8 bits)
    +static int pcf50633_regulator_get_voltage_sel(struct regulator_dev *rdev)
    {
    + struct pcf50633 *pcf;
    + int regulator_id;
    + u8 regnr;
    +
    + pcf = rdev_get_drvdata(rdev);
    +
    + regulator_id = rdev_get_id(rdev);
    + if (regulator_id >= PCF50633_NUM_REGULATORS)
    + return -EINVAL;
    +
    + regnr = pcf50633_regulator_registers[regulator_id];
    +
    + return pcf50633_reg_read(pcf, regnr);
    +}
    +
    +static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev,
    + unsigned int index)
    +{
    + int regulator_id = rdev_get_id(rdev);
    +
    int millivolts;

    - switch (id) {
    + switch (regulator_id) {
    case PCF50633_REGULATOR_AUTO:
    - millivolts = auto_voltage_value(bits);
    + millivolts = auto_voltage_value(index);
    break;
    case PCF50633_REGULATOR_DOWN1:
    - millivolts = down_voltage_value(bits);
    + millivolts = down_voltage_value(index);
    break;
    case PCF50633_REGULATOR_DOWN2:
    - millivolts = down_voltage_value(bits);
    + millivolts = down_voltage_value(index);
    break;
    case PCF50633_REGULATOR_LDO1:
    case PCF50633_REGULATOR_LDO2:
    @@ -180,7 +199,7 @@ static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id,
    case PCF50633_REGULATOR_LDO6:
    case PCF50633_REGULATOR_HCLDO:
    case PCF50633_REGULATOR_MEMLDO:
    - millivolts = ldo_voltage_value(bits);
    + millivolts = ldo_voltage_value(index);
    break;
    default:
    return -EINVAL;
    @@ -189,33 +208,6 @@ static int pcf50633_regulator_voltage_value(enum pcf50633_regulator_id id,
    return millivolts * 1000;
    }

    -static int pcf50633_regulator_get_voltage(struct regulator_dev *rdev)
    -{
    - struct pcf50633 *pcf;
    - int regulator_id;
    - u8 volt_bits, regnr;
    -
    - pcf = rdev_get_drvdata(rdev);
    -
    - regulator_id = rdev_get_id(rdev);
    - if (regulator_id >= PCF50633_NUM_REGULATORS)
    - return -EINVAL;
    -
    - regnr = pcf50633_regulator_registers[regulator_id];
    -
    - volt_bits = pcf50633_reg_read(pcf, regnr);
    -
    - return pcf50633_regulator_voltage_value(regulator_id, volt_bits);
    -}
    -
    -static int pcf50633_regulator_list_voltage(struct regulator_dev *rdev,
    - unsigned int index)
    -{
    - int regulator_id = rdev_get_id(rdev);
    -
    - return pcf50633_regulator_voltage_value(regulator_id, index);
    -}
    -
    static int pcf50633_regulator_enable(struct regulator_dev *rdev)
    {
    struct pcf50633 *pcf = rdev_get_drvdata(rdev);
    @@ -268,7 +260,7 @@ static int pcf50633_regulator_is_enabled(struct regulator_dev *rdev)

    static struct regulator_ops pcf50633_regulator_ops = {
    .set_voltage = pcf50633_regulator_set_voltage,
    - .get_voltage = pcf50633_regulator_get_voltage,
    + .get_voltage_sel = pcf50633_regulator_get_voltage_sel,
    .list_voltage = pcf50633_regulator_list_voltage,
    .enable = pcf50633_regulator_enable,
    .disable = pcf50633_regulator_disable,
    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-03-19 03:59    [W:0.025 / U:32.936 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site