lkml.org 
[lkml]   [2012]   [Feb]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/2] regulator: Kill max8998_get_ldo function
    From
    Date
    Use rdev_get_id() directly.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/max8998.c | 15 +++++----------
    1 files changed, 5 insertions(+), 10 deletions(-)

    diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c
    index 2d38c24..634f257 100644
    --- a/drivers/regulator/max8998.c
    +++ b/drivers/regulator/max8998.c
    @@ -112,16 +112,11 @@ static const struct voltage_map_desc *ldo_voltage_map[] = {
    &buck4_voltage_map_desc, /* BUCK4 */
    };

    -static inline int max8998_get_ldo(struct regulator_dev *rdev)
    -{
    - return rdev_get_id(rdev);
    -}
    -
    static int max8998_list_voltage(struct regulator_dev *rdev,
    unsigned int selector)
    {
    const struct voltage_map_desc *desc;
    - int ldo = max8998_get_ldo(rdev);
    + int ldo = rdev_get_id(rdev);
    int val;

    if (ldo >= ARRAY_SIZE(ldo_voltage_map))
    @@ -141,7 +136,7 @@ static int max8998_list_voltage(struct regulator_dev *rdev,
    static int max8998_get_enable_register(struct regulator_dev *rdev,
    int *reg, int *shift)
    {
    - int ldo = max8998_get_ldo(rdev);
    + int ldo = rdev_get_id(rdev);

    switch (ldo) {
    case MAX8998_LDO2 ... MAX8998_LDO5:
    @@ -222,7 +217,7 @@ static int max8998_ldo_disable(struct regulator_dev *rdev)
    static int max8998_get_voltage_register(struct regulator_dev *rdev,
    int *_reg, int *_shift, int *_mask)
    {
    - int ldo = max8998_get_ldo(rdev);
    + int ldo = rdev_get_id(rdev);
    struct max8998_data *max8998 = rdev_get_drvdata(rdev);
    int reg, shift = 0, mask = 0xff;

    @@ -310,7 +305,7 @@ static int max8998_set_voltage_ldo(struct regulator_dev *rdev,
    struct i2c_client *i2c = max8998->iodev->i2c;
    int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
    const struct voltage_map_desc *desc;
    - int ldo = max8998_get_ldo(rdev);
    + int ldo = rdev_get_id(rdev);
    int reg, shift = 0, mask, ret;
    int i = 0;

    @@ -362,7 +357,7 @@ static int max8998_set_voltage_buck(struct regulator_dev *rdev,
    struct i2c_client *i2c = max8998->iodev->i2c;
    int min_vol = min_uV / 1000, max_vol = max_uV / 1000;
    const struct voltage_map_desc *desc;
    - int buck = max8998_get_ldo(rdev);
    + int buck = rdev_get_id(rdev);
    int reg, shift = 0, mask, ret;
    int difference = 0, i = 0, j = 0, previous_vol = 0;
    u8 val = 0;
    --
    1.7.5.4




    \
     
     \ /
      Last update: 2012-03-01 02:29    [W:0.022 / U:33.188 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site