linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Andrew F. Davis" <afd@ti.com>
To: "Pali Rohár" <pali.rohar@gmail.com>,
	"Sebastian Reichel" <sre@kernel.org>,
	"Dmitry Eremin-Solenikov" <dbaryshkov@gmail.com>,
	"David Woodhouse" <dwmw2@infradead.org>,
	"Dan Murphy" <dmurphy@ti.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	"Andrew F. Davis" <afd@ti.com>
Subject: [PATCH 6/8] power: bq27xxx_battery: Fix typos and change naming for state of charge functions
Date: Wed, 22 Jul 2015 16:51:58 -0500	[thread overview]
Message-ID: <1437601920-13045-7-git-send-email-afd@ti.com> (raw)
In-Reply-To: <1437601920-13045-1-git-send-email-afd@ti.com>

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 <afd@ti.com>
---
 drivers/power/bq27xxx_battery.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/power/bq27xxx_battery.c b/drivers/power/bq27xxx_battery.c
index f5d7a137..5686da6 100644
--- a/drivers/power/bq27xxx_battery.c
+++ b/drivers/power/bq27xxx_battery.c
@@ -231,26 +231,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);
+		soc = bq27xxx_read(di, BQ27425_REG_SOC, false);
 	else
-		rsoc = bq27xxx_read(di, BQ27000_REG_RSOC, true);
+		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;
 }
 
 /*
@@ -277,7 +277,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)
@@ -418,7 +418,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)
@@ -500,7 +500,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,
-- 
1.9.1

  parent reply	other threads:[~2015-07-22 21:51 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-22 21:51 [PATCH 0/8] Add support for additional bq27xxx devices Andrew F. Davis
2015-07-22 21:51 ` [PATCH 1/8] power: bq27x00_battery: Add manufacturer property Andrew F. Davis
2015-07-23 15:55   ` Dan Murphy
2015-07-23 15:59   ` Pali Rohár
2015-07-24 15:36   ` Sebastian Reichel
2015-07-22 21:51 ` [PATCH 2/8] power: bq27x00_battery: Fix lines over 80 characters long Andrew F. Davis
2015-07-23 16:00   ` Pali Rohár
2015-07-23 16:02   ` Dan Murphy
2015-07-24 15:36   ` Sebastian Reichel
2015-07-22 21:51 ` [PATCH 3/8] power: bq27x00_battery: Fix function parameter alignment Andrew F. Davis
2015-07-23 16:00   ` Pali Rohár
2015-07-23 16:02   ` Dan Murphy
2015-07-24 15:37   ` Sebastian Reichel
2015-07-22 21:51 ` [PATCH 4/8] power: bq27x00_battery: Checkpatch fixes Andrew F. Davis
2015-07-23 16:01   ` Pali Rohár
2015-07-23 16:04   ` Dan Murphy
2015-07-24 15:37   ` Sebastian Reichel
2015-07-22 21:51 ` [PATCH 5/8] power: bq27x00_battery: Renaming for consistency Andrew F. Davis
2015-07-23 16:12   ` Pali Rohár
     [not found]     ` <55B11E4C.6000006@ti.com>
2015-07-23 20:15       ` Pali Rohár
2015-07-23 20:56         ` Belisko Marek
2015-07-23 21:15           ` Pali Rohár
2015-07-23 21:36             ` Belisko Marek
2015-07-24  7:44               ` Pali Rohár
2015-07-22 21:51 ` Andrew F. Davis [this message]
2015-07-23 16:15   ` [PATCH 6/8] power: bq27xxx_battery: Fix typos and change naming for state of charge functions Pali Rohár
2015-07-23 17:19     ` Andrew F. Davis
2015-07-28  8:41       ` Pali Rohár
2015-07-22 21:51 ` [PATCH 7/8] power: bq27xxx_battery: Add support for additional bq27xxx family devices Andrew F. Davis
2015-07-23 16:20   ` Pali Rohár
2015-07-23 17:42     ` Andrew F. Davis
2015-07-28  8:43       ` Pali Rohár
2015-07-22 21:52 ` [PATCH 8/8] power: bq27xxx_battery: Cleanup health checking Andrew F. Davis
2015-07-23 16:22   ` Pali Rohár
2015-07-23 17:06     ` Joe Perches
2015-07-24 20:32       ` Andrew F. Davis
2015-07-24 20:27     ` Andrew F. Davis
2015-07-24 20:53       ` Pali Rohár
2015-07-23 16:27 ` [PATCH 0/8] Add support for additional bq27xxx devices Pali Rohár
2015-07-23 17:01   ` Andreas Dannenberg
2015-07-24 15:57   ` Andrew F. Davis

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1437601920-13045-7-git-send-email-afd@ti.com \
    --to=afd@ti.com \
    --cc=dbaryshkov@gmail.com \
    --cc=dmurphy@ti.com \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pali.rohar@gmail.com \
    --cc=sre@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).