aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-08-31 05:26:22 -0400
committerAnton Vorontsov <anton.vorontsov@linaro.org>2012-09-20 21:06:13 -0400
commit20414e2e0e10c2152e44784599e6d66fae39d77c (patch)
tree8492f478b91c1a43c5ac806e1f8b2ea96e97a862 /drivers/power
parente06374b0d6055ef21e49d14d955eb9fc5088f707 (diff)
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.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c
index 13a787adcbe..19c21f9b6d3 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,
393static void lp8727_charger_changed(struct power_supply *psy) 393static void lp8727_charger_changed(struct power_supply *psy)
394{ 394{
395 struct lp8727_chg *pchg = dev_get_drvdata(psy->dev->parent); 395 struct lp8727_chg *pchg = dev_get_drvdata(psy->dev->parent);
396 u8 eoc_level;
397 u8 ichg;
396 u8 val; 398 u8 val;
397 u8 eoc_level, ichg; 399
398 400 /* skip if no charger exists */
399 if (lp8727_is_charger_attached(psy->name, pchg->devid)) { 401 if (!lp8727_is_charger_attached(psy->name, pchg->devid))
400 if (pchg->chg_parm) { 402 return;
401 eoc_level = pchg->chg_parm->eoc_level; 403
402 ichg = pchg->chg_parm->ichg; 404 /* update charging parameters */
403 val = (ichg << LP8727_ICHG_SHIFT) | eoc_level; 405 if (pchg->chg_parm) {
404 lp8727_write_byte(pchg, LP8727_CHGCTRL2, val); 406 eoc_level = pchg->chg_parm->eoc_level;
405 } 407 ichg = pchg->chg_parm->ichg;
408 val = (ichg << LP8727_ICHG_SHIFT) | eoc_level;
409 lp8727_write_byte(pchg, LP8727_CHGCTRL2, val);
406 } 410 }
407} 411}
408 412