From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Andrew F. Davis" Subject: Re: [PATCH 8/8] power: bq27xxx_battery: Cleanup health checking Date: Fri, 24 Jul 2015 15:27:39 -0500 Message-ID: <55B29FBB.8080500@ti.com> References: <1437601920-13045-1-git-send-email-afd@ti.com> <1437601920-13045-9-git-send-email-afd@ti.com> <20150723162212.GI29125@pali> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from bear.ext.ti.com ([192.94.94.41]:43952 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752356AbbGXU2I (ORCPT ); Fri, 24 Jul 2015 16:28:08 -0400 In-Reply-To: <20150723162212.GI29125@pali> Sender: linux-pm-owner@vger.kernel.org List-Id: linux-pm@vger.kernel.org To: =?UTF-8?B?UGFsaSBSb2jDoXI=?= Cc: Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Dan Murphy , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org On 07/23/2015 11:22 AM, Pali Roh=C3=A1r wrote: > On Wednesday 22 July 2015 16:52:00 Andrew F. Davis wrote: >> Reorganize the logic checking battery health and under temperature >> condition checking. >> >> Signed-off-by: Andrew F. Davis >> --- >> drivers/power/bq27xxx_battery.c | 62 +++++++++++++++++++++++++++---= ----------- >> 1 file changed, 41 insertions(+), 21 deletions(-) >> >> diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx= _battery.c >> index f148222..6775f65 100644 >> --- a/drivers/power/bq27xxx_battery.c >> +++ b/drivers/power/bq27xxx_battery.c >> @@ -54,6 +54,8 @@ >> #define BQ27XXX_FLAG_FC BIT(9) >> #define BQ27XXX_FLAG_OTD BIT(14) >> #define BQ27XXX_FLAG_OTC BIT(15) >> +#define BQ27XXX_FLAG_UT BIT(14) >> +#define BQ27XXX_FLAG_OT BIT(15) >> =20 >> /* BQ27000 has different layout for Flags register */ >> #define BQ27000_FLAG_EDVF BIT(0) /* Final End-of-Discharge-Voltage = flag */ >> @@ -624,10 +626,34 @@ static int bq27xxx_battery_read_pwr_avg(struct= bq27xxx_device_info *di) >> */ >> static int bq27xxx_battery_overtemp(struct bq27xxx_device_info *di,= u16 flags) >> { >> - if (di->chip =3D=3D BQ27500 || di->chip =3D=3D BQ27541) >> + if (di->chip =3D=3D BQ27500 || di->chip =3D=3D BQ27541 || di->chip= =3D=3D BQ27545) >> return flags & (BQ27XXX_FLAG_OTC | BQ27XXX_FLAG_OTD); >> + if (di->chip =3D=3D BQ27530 || di->chip =3D=3D BQ27421) >> + return flags & BQ27XXX_FLAG_OT; >> + >> + return false; >> +} >> + >> +/* >> + * Returns true if a battery under temperature condition is detecte= d >> + */ >> +static int bq27xxx_battery_undertemp(struct bq27xxx_device_info *di= , u16 flags) >> +{ >> + if (di->chip =3D=3D BQ27530 || di->chip =3D=3D BQ27421) >> + return flags & BQ27XXX_FLAG_UT; >> + >> + return false; >> +} >> + >> +/* >> + * Returns true if a low state of charge condition is detected >> + */ >> +static int bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16= flags) >> +{ >> + if (di->chip =3D=3D BQ27000 || di->chip =3D=3D BQ27010) >> + return flags & (BQ27000_FLAG_EDV1 | BQ27000_FLAG_EDVF); >> else >> - return flags & BQ27XXX_FLAG_OTC; >> + return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF); >> } >> =20 >> /* >> @@ -636,29 +662,23 @@ static int bq27xxx_battery_overtemp(struct bq2= 7xxx_device_info *di, u16 flags) >> */ >> static int bq27xxx_battery_read_health(struct bq27xxx_device_info *= di) >> { >> - u16 tval; >> + u16 flags; >> =20 >> - tval =3D bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); >> - if (tval < 0) { >> - dev_err(di->dev, "error reading flag register:%d\n", tval); >> - return tval; >> + flags =3D bq27xxx_read(di, BQ27XXX_REG_FLAGS, false); >> + if (flags < 0) { >> + dev_err(di->dev, "error reading flag register:%d\n", flags); >> + return flags; >> } >> =20 >> - if (di->chip =3D=3D BQ27000 || di->chip =3D=3D BQ27010) { >> - if (tval & BQ27000_FLAG_EDV1) >> - tval =3D POWER_SUPPLY_HEALTH_DEAD; >> - else >> - tval =3D POWER_SUPPLY_HEALTH_GOOD; >> - } else { >> - if (tval & BQ27XXX_FLAG_SOCF) >> - tval =3D POWER_SUPPLY_HEALTH_DEAD; >> - else if (bq27xxx_battery_overtemp(di, tval)) >> - tval =3D POWER_SUPPLY_HEALTH_OVERHEAT; >> - else >> - tval =3D POWER_SUPPLY_HEALTH_GOOD; >> - } >> + /* Unlikely but important to return first */ >> + if (bq27xxx_battery_overtemp(di, flags)) >> + return POWER_SUPPLY_HEALTH_OVERHEAT; >> + if (bq27xxx_battery_undertemp(di, flags)) >> + return POWER_SUPPLY_HEALTH_COLD; >> + if (bq27xxx_battery_dead(di, flags)) >> + return POWER_SUPPLY_HEALTH_DEAD; >=20 > Good candidates for "if (unlikely(...))" ? >=20 I wasn't sure, but I don't see why not. Added. Thanks, Andrew >> =20 >> - return tval; >> + return POWER_SUPPLY_HEALTH_GOOD; >> } >> =20 >> static void bq27xxx_battery_update(struct bq27xxx_device_info *di) >=20