diff options
| author |   Kim, Milo <Milo.Kim@ti.com> | 2012-08-31 09:26:22 +0000 |
|---|---|---|
| committer |   Anton Vorontsov <anton.vorontsov@linaro.org> | 2012-09-20 18:06:13 -0700 |
| commit | 20414e2e0e10c2152e44784599e6d66fae39d77c (patch) | |
| tree | 8492f478b91c1a43c5ac806e1f8b2ea96e97a862 /drivers/power | |
| parent | lp8727_charger: Return if the battery is discharging (diff) | |
| download | linux-dev-20414e2e0e10c2152e44784599e6d66fae39d77c.tar.xz linux-dev-20414e2e0e10c2152e44784599e6d66fae39d77c.zip | |
lp8727_charger: Clean up lp8727_charger_changed()
Declare a variable at one line. Just return when no charger exists to make
code simpler.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/lp8727_charger.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 13a787adcbe9..19c21f9b6d3b 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -393,16 +393,20 @@ static int lp8727_battery_get_property(struct power_supply *psy, static void lp8727_charger_changed(struct power_supply *psy) { struct lp8727_chg *pchg = dev_get_drvdata(psy->dev->parent); + u8 eoc_level; + u8 ichg; u8 val; - u8 eoc_level, ichg; - - if (lp8727_is_charger_attached(psy->name, pchg->devid)) { - if (pchg->chg_parm) { - eoc_level = pchg->chg_parm->eoc_level; - ichg = pchg->chg_parm->ichg; - val = (ichg << LP8727_ICHG_SHIFT) | eoc_level; - lp8727_write_byte(pchg, LP8727_CHGCTRL2, val); - } + + /* skip if no charger exists */ + if (!lp8727_is_charger_attached(psy->name, pchg->devid)) + return; + + /* update charging parameters */ + if (pchg->chg_parm) { + eoc_level = pchg->chg_parm->eoc_level; + ichg = pchg->chg_parm->ichg; + val = (ichg << LP8727_ICHG_SHIFT) | eoc_level; + lp8727_write_byte(pchg, LP8727_CHGCTRL2, val); } } |