From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752036AbbHBHhI (ORCPT ); Sun, 2 Aug 2015 03:37:08 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:47109 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbbHBHhF (ORCPT ); Sun, 2 Aug 2015 03:37:05 -0400 Date: Sun, 2 Aug 2015 09:37:02 +0200 From: Pavel Machek To: "Andrew F. Davis" Cc: Pali =?iso-8859-1?Q?Roh=E1r?= , Sebastian Reichel , Dmitry Eremin-Solenikov , David Woodhouse , Dan Murphy , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 4/6] power: bq27xxx_battery: Fix typos and change naming for state of charge functions Message-ID: <20150802073702.GC3720@amd> References: <1438112353-19704-1-git-send-email-afd@ti.com> <1438112353-19704-5-git-send-email-afd@ti.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1438112353-19704-5-git-send-email-afd@ti.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue 2015-07-28 14:39:11, Andrew F. Davis wrote: > Fix typos and change "relative state of charge" to "state of charge" as not > all supported devices use relative state of charge. > > Signed-off-by: Andrew F. Davis Acked-by: Pavel Machek > --- > drivers/power/bq27xxx_battery.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c > index 0734413..1ff88ad 100644 > --- a/drivers/power/bq27xxx_battery.c > +++ b/drivers/power/bq27xxx_battery.c > @@ -229,26 +229,26 @@ static bool bq27xxx_is_chip_version_higher(struct bq27xxx_device_info *di) > } > > /* > - * Return the battery Relative State-of-Charge > + * Return the battery State-of-Charge > * Or < 0 if something fails. > */ > -static int bq27xxx_battery_read_rsoc(struct bq27xxx_device_info *di) > +static int bq27xxx_battery_read_soc(struct bq27xxx_device_info *di) > { > - int rsoc; > + int soc; > > if (di->chip == BQ27500 || di->chip == BQ27742) > - rsoc = bq27xxx_read(di, BQ27500_REG_SOC, false); > + soc = bq27xxx_read(di, BQ27500_REG_SOC, false); > else if (di->chip == BQ27510) > - rsoc = bq27xxx_read(di, BQ27510_REG_SOC, false); > + soc = bq27xxx_read(di, BQ27510_REG_SOC, false); > else if (di->chip == BQ27425) > - rsoc = bq27xxx_read(di, BQ27425_REG_SOC, false); > - else > - rsoc = bq27xxx_read(di, BQ27000_REG_RSOC, true); > + soc = bq27xxx_read(di, BQ27425_REG_SOC, false); > + else /* for the bq27000 we read the "relative" SoC register */ > + soc = bq27xxx_read(di, BQ27000_REG_RSOC, true); > > - if (rsoc < 0) > - dev_dbg(di->dev, "error reading relative State-of-Charge\n"); > + if (soc < 0) > + dev_dbg(di->dev, "error reading State-of-Charge\n"); > > - return rsoc; > + return soc; > } > > /* > @@ -275,7 +275,7 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg) > } > > /* > - * Return the battery Nominal available capaciy in ľAh > + * Return the battery Nominal available capacity in ľAh > * Or < 0 if something fails. > */ > static inline int bq27xxx_battery_read_nac(struct bq27xxx_device_info *di) > @@ -416,7 +416,7 @@ static int bq27xxx_battery_read_time(struct bq27xxx_device_info *di, u8 reg) > } > > /* > - * Read a power avg register. > + * Read an average power register. > * Return < 0 if something fails. > */ > static int bq27xxx_battery_read_pwr_avg(struct bq27xxx_device_info *di, u8 reg) > @@ -498,7 +498,7 @@ static void bq27xxx_battery_update(struct bq27xxx_device_info *di) > cache.charge_full = -ENODATA; > cache.health = -ENODATA; > } else { > - cache.capacity = bq27xxx_battery_read_rsoc(di); > + cache.capacity = bq27xxx_battery_read_soc(di); > if (is_bq27742 || is_bq27510) > cache.time_to_empty = > bq27xxx_battery_read_time(di, -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html