Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754369Ab2H3LlL (ORCPT ); Thu, 30 Aug 2012 07:41:11 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:40933 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752851Ab2H3LlI convert rfc822-to-8bit (ORCPT ); Thu, 30 Aug 2012 07:41:08 -0400 From: "Kim, Milo" To: Anton Vorontsov CC: "linux-kernel@vger.kernel.org" , David Woodhouse , Anton Vorontsov Subject: [PATCH 8/8] lp8727_charger: make cosmetic code Thread-Topic: [PATCH 8/8] lp8727_charger: make cosmetic code Thread-Index: Ac2GpFNmhrB49RUIRA6a/Z3tLB/28Q== Date: Thu, 30 Aug 2012 11:41:01 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [157.87.185.123] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6315 Lines: 192 (a) change the return type of lp8727_is_charger_attached() (b) remove unnecessary name comparison in lp8727_is_charger_attached() (c) return as the result of function in lp8727_init_device() (d) make inline function for lp8727_ctrl_switch() (e) use specific definition rather than magic number in lp8727_delayed_func() (f) make simple code in power_supply_get_properties (g) make simple code in lp8727_charger_changed() (h) fix checkpatch warning on MODULE_AUTHOR (i) fit spaces for description in header Signed-off-by: Milo(Woogyom) Kim --- drivers/power/lp8727_charger.c | 77 ++++++++++++++++++---------------- include/linux/platform_data/lp8727.h | 2 +- 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/drivers/power/lp8727_charger.c b/drivers/power/lp8727_charger.c index 610d286..41bc0f3 100644 --- a/drivers/power/lp8727_charger.c +++ b/drivers/power/lp8727_charger.c @@ -121,14 +121,12 @@ static inline int lp8727_write_byte(struct lp8727_chg *pchg, u8 reg, u8 data) return i2c_smbus_write_byte_data(pchg->client, reg, data); } -static int lp8727_is_charger_attached(const char *name, int id) +static bool lp8727_is_charger_attached(const char *name, int id) { - if (name) { - if (!strcmp(name, "ac")) - return id == LP8727_CHG_TA || id == LP8727_CHG_DEDICATED; - else if (!strcmp(name, "usb")) - return id == LP8727_CHG_USB; - } + if (!strcmp(name, "ac")) + return id == LP8727_CHG_TA || id == LP8727_CHG_DEDICATED; + else if (!strcmp(name, "usb")) + return id == LP8727_CHG_USB; return id >= LP8727_CHG_TA && id <= LP8727_CHG_USB; } @@ -150,16 +148,13 @@ static int lp8727_init_device(struct lp8727_chg *pchg) return ret; val = LP8727_INT_EN | LP8727_CHGDET_EN; - ret = lp8727_write_byte(pchg, LP8727_CTRL2, val); - if (ret) - return ret; - - return 0; + return lp8727_write_byte(pchg, LP8727_CTRL2, val); } static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg) { u8 val; + lp8727_read_byte(pchg, LP8727_STATUS1, &val); return val & LP8727_DCPORT; } @@ -167,11 +162,12 @@ static int lp8727_is_dedicated_charger(struct lp8727_chg *pchg) static int lp8727_is_usb_charger(struct lp8727_chg *pchg) { u8 val; + lp8727_read_byte(pchg, LP8727_STATUS1, &val); return val & LP8727_CHPORT; } -static void lp8727_ctrl_switch(struct lp8727_chg *pchg, u8 sw) +static inline void lp8727_ctrl_switch(struct lp8727_chg *pchg, u8 sw) { lp8727_write_byte(pchg, LP8727_SWCTRL, sw); } @@ -221,11 +217,13 @@ static void lp8727_enable_chgdet(struct lp8727_chg *pchg) static void lp8727_delayed_func(struct work_struct *_work) { - u8 intstat[2], idno, vbus; - struct lp8727_chg *pchg = - container_of(_work, struct lp8727_chg, work.work); + struct lp8727_chg *pchg = container_of(_work, struct lp8727_chg, + work.work); + u8 intstat[LP8788_NUM_INTREGS]; + u8 idno; + u8 vbus; - 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; } @@ -308,9 +306,10 @@ static int lp8727_charger_get_property(struct power_supply *psy, { struct lp8727_chg *pchg = dev_get_drvdata(psy->dev->parent); - if (psp == POWER_SUPPLY_PROP_ONLINE) - val->intval = lp8727_is_charger_attached(psy->name, - pchg->chg_type); + if (psp != POWER_SUPPLY_PROP_ONLINE) + return 0; + + val->intval = lp8727_is_charger_attached(psy->name, pchg->chg_type); return 0; } @@ -338,15 +337,16 @@ static int lp8727_battery_get_property(struct power_supply *psy, switch (psp) { case POWER_SUPPLY_PROP_STATUS: - if (lp8727_is_charger_attached(psy->name, pchg->chg_type)) { - lp8727_read_byte(pchg, LP8727_STATUS1, &read); + if (!lp8727_is_charger_attached(psy->name, pchg->chg_type)) { + val->intval = POWER_SUPPLY_STATUS_DISCHARGING; + return 0; + } + + lp8727_read_byte(pchg, LP8727_STATUS1, &read); - val->intval = (read & LP8727_CHGSTAT) == LP8727_STAT_EOC ? + val->intval = (read & LP8727_CHGSTAT) == LP8727_STAT_EOC ? POWER_SUPPLY_STATUS_FULL : POWER_SUPPLY_STATUS_CHARGING; - } else { - val->intval = POWER_SUPPLY_STATUS_DISCHARGING; - } break; case POWER_SUPPLY_PROP_HEALTH: lp8727_read_byte(pchg, LP8727_STATUS2, &read); @@ -394,16 +394,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->chg_type)) { - if (pchg->chg_param) { - eoc_level = pchg->chg_param->eoc_level; - ichg = pchg->chg_param->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->chg_type)) + return; + + /* update charging parameters */ + if (pchg->chg_param) { + eoc_level = pchg->chg_param->eoc_level; + ichg = pchg->chg_param->ichg; + val = (ichg << LP8727_ICHG_SHIFT) | eoc_level; + lp8727_write_byte(pchg, LP8727_CHGCTRL2, val); } } @@ -538,6 +542,5 @@ static struct i2c_driver lp8727_driver = { module_i2c_driver(lp8727_driver); MODULE_DESCRIPTION("TI/National Semiconductor LP8727 charger driver"); -MODULE_AUTHOR("Woogyom Kim , " - "Daniel Jeong "); +MODULE_AUTHOR("Milo Kim , Daniel Jeong "); MODULE_LICENSE("GPL"); diff --git a/include/linux/platform_data/lp8727.h b/include/linux/platform_data/lp8727.h index 5b443a1..b564d02 100644 --- a/include/linux/platform_data/lp8727.h +++ b/include/linux/platform_data/lp8727.h @@ -38,7 +38,7 @@ enum lp8727_ichg { /** * struct lp8727_chg_param * @eoc_level : end of charge level setting - * @ichg : charging current + * @ichg : charging current */ struct lp8727_chg_param { enum lp8727_eoc_level eoc_level; -- 1.7.9.5 Best Regards, Milo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/