From 18763a36d0bae11a916ffe8fa58a26fd0b5eb115 Mon Sep 17 00:00:00 2001 From: "Kim, Milo" Date: Fri, 31 Aug 2012 09:25:07 +0000 Subject: [PATCH] lp8727_charger: Use specific definition Add new LP8727_ICHG_SHIFT definition and replace a magic number. Reuse definition for the size of interrupt register buffer. Signed-off-by: Milo(Woogyom) Kim Signed-off-by: Anton Vorontsov --- drivers/power/lp8727_charger.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 65c9840a37e..254bbe07c26 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -59,6 +59,9 @@ #define LP8727_TEMP_STAT (3 << 5) #define LP8727_TEMP_SHIFT 5 +/* CHGCTRL2 register */ +#define LP8727_ICHG_SHIFT 4 + enum lp8727_dev_id { LP8727_ID_NONE, LP8727_ID_TA, @@ -222,11 +225,11 @@ static void lp8727_enable_chgdet(struct lp8727_chg *pchg) static void lp8727_delayed_func(struct work_struct *_work) { - u8 intstat[2], idno, vbus; + u8 intstat[LP8788_NUM_INTREGS], idno, vbus; struct lp8727_chg *pchg = container_of(_work, struct lp8727_chg, work.work); - if (lp8727_read_bytes(pchg, LP8727_INT1, intstat, 2)) { + if (lp8727_read_bytes(pchg, LP8727_INT1, intstat, LP8788_NUM_INTREGS)) { dev_err(pchg->dev, "can not read INT registers\n"); return; } @@ -401,7 +404,7 @@ static void lp8727_charger_changed(struct power_supply *psy) if (pchg->chg_parm) { eoc_level = pchg->chg_parm->eoc_level; ichg = pchg->chg_parm->ichg; - val = (ichg << 4) | eoc_level; + val = (ichg << LP8727_ICHG_SHIFT) | eoc_level; lp8727_write_byte(pchg, LP8727_CHGCTRL2, val); } }