lkml.org 
[lkml]   [2012]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] regulator: palmas: Slightly code change for better readability
    From
    Date
    It's a little bit hard to read that the "else" case means id == PALMAS_REG_SMPS10.

    This patch changes below syntax:
    if (id != PALMAS_REG_SMPS10){
    do something for the cases id != PALMAS_REG_SMPS10;
    } else {
    do something for the case id == PALMAS_REG_SMPS10;
    }

    to below syntax:
    if (id == PALMAS_REG_SMPS10) {
    do something for the case id == PALMAS_REG_SMPS10;
    } else {
    do something for the cases id != PALMAS_REG_SMPS10;
    }

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/regulator/palmas-regulator.c | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
    index b4e10b0..5820d1a 100644
    --- a/drivers/regulator/palmas-regulator.c
    +++ b/drivers/regulator/palmas-regulator.c
    @@ -517,7 +517,13 @@ static int palmas_smps_init(struct palmas *palmas, int id,
    if (ret)
    return ret;

    - if (id != PALMAS_REG_SMPS10) {
    + if (id == PALMAS_REG_SMPS10) {
    + if (reg_init->mode_sleep) {
    + reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;
    + reg |= reg_init->mode_sleep <<
    + PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT;
    + }
    + } else {
    if (reg_init->warm_reset)
    reg |= PALMAS_SMPS12_CTRL_WR_S;

    @@ -529,12 +535,6 @@ static int palmas_smps_init(struct palmas *palmas, int id,
    reg |= reg_init->mode_sleep <<
    PALMAS_SMPS12_CTRL_MODE_SLEEP_SHIFT;
    }
    - } else {
    - if (reg_init->mode_sleep) {
    - reg &= ~PALMAS_SMPS10_CTRL_MODE_SLEEP_MASK;
    - reg |= reg_init->mode_sleep <<
    - PALMAS_SMPS10_CTRL_MODE_SLEEP_SHIFT;
    - }

    }
    ret = palmas_smps_write(palmas, addr, reg);
    @@ -660,10 +660,7 @@ static __devinit int palmas_probe(struct platform_device *pdev)
    pmic->desc[id].name = palmas_regs_info[id].name;
    pmic->desc[id].id = id;

    - if (id != PALMAS_REG_SMPS10) {
    - pmic->desc[id].ops = &palmas_ops_smps;
    - pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;
    - } else {
    + if (id == PALMAS_REG_SMPS10) {
    pmic->desc[id].n_voltages = PALMAS_SMPS10_NUM_VOLTAGES;
    pmic->desc[id].ops = &palmas_ops_smps10;
    pmic->desc[id].vsel_reg = PALMAS_SMPS10_CTRL;
    @@ -672,6 +669,9 @@ static __devinit int palmas_probe(struct platform_device *pdev)
    pmic->desc[id].enable_mask = SMPS10_BOOST_EN;
    pmic->desc[id].min_uV = 3750000;
    pmic->desc[id].uV_step = 1250000;
    + } else {
    + pmic->desc[id].ops = &palmas_ops_smps;
    + pmic->desc[id].n_voltages = PALMAS_SMPS_NUM_VOLTAGES;
    }

    pmic->desc[id].type = REGULATOR_VOLTAGE;
    --
    1.7.9.5




    \
     
     \ /
      Last update: 2012-06-06 10:21    [W:0.043 / U:0.540 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site