From: Tony Lindgren <tony@atomide.com>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-omap@vger.kernel.org,
Merlijn Wajer <merlijn@wizzup.org>, Pavel Machek <pavel@ucw.cz>
Subject: [PATCH 2/5] power: supply: cpcap-battery: Simplify coulomb counter calculation with div_s64
Date: Wed, 9 Oct 2019 14:06:18 -0700 [thread overview]
Message-ID: <20191009210621.10522-3-tony@atomide.com> (raw)
In-Reply-To: <20191009210621.10522-1-tony@atomide.com>
We can simplify cpcap_battery_cc_raw_div() with div_s64.
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
drivers/power/supply/cpcap-battery.c | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -33,8 +33,6 @@
#include <linux/iio/types.h>
#include <linux/mfd/motorola-cpcap.h>
-#include <asm/div64.h>
-
/*
* Register bit defines for CPCAP_REG_BPEOL. Some of these seem to
* map to MC13783UG.pdf "Table 5-19. Register 13, Power Control 0"
@@ -219,28 +217,17 @@ static int cpcap_battery_cc_raw_div(struct cpcap_battery_ddata *ddata,
s16 offset, u32 divider)
{
s64 acc;
- u64 tmp;
- int avg_current;
if (!divider)
return 0;
acc = accumulator;
- acc = acc - ((s64)sample * offset);
-
- if (acc >= 0)
- tmp = acc;
- else
- tmp = acc * -1;
+ acc -= (s64)sample * offset;
+ acc *= ddata->cc_lsb;
+ acc *= -1;
+ acc = div_s64(acc, divider);
- tmp = tmp * ddata->cc_lsb;
- do_div(tmp, divider);
- avg_current = tmp;
-
- if (acc >= 0)
- return -avg_current;
- else
- return avg_current;
+ return acc;
}
/* 3600000μAms = 1μAh */
--
2.23.0
next prev parent reply other threads:[~2019-10-09 21:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 21:06 [PATCH 0/5] cpcap battery simplification and calibrate support Tony Lindgren
2019-10-09 21:06 ` [PATCH 1/5] power: supply: cpcap-battery: Move coulomb counter units per lsb to ddata Tony Lindgren
2019-10-13 10:55 ` Pavel Machek
2019-10-16 22:01 ` Tony Lindgren
2019-10-13 11:35 ` Pavel Machek
2019-10-09 21:06 ` Tony Lindgren [this message]
2019-10-13 11:01 ` [PATCH 2/5] power: supply: cpcap-battery: Simplify coulomb counter calculation with div_s64 Pavel Machek
2019-10-13 11:36 ` Pavel Machek
2019-10-09 21:06 ` [PATCH 3/5] power: supply: cpcap-battery: Simplify short term power average calculation Tony Lindgren
2019-10-13 11:42 ` Pavel Machek
2019-10-13 11:42 ` Pavel Machek
2019-10-09 21:06 ` [PATCH 4/5] power: supply: cpcap-battery: Read and save integrator register CCI Tony Lindgren
2019-10-09 21:06 ` [PATCH 5/5] power: supply: cpcap-battery: Add basic coulomb counter calibrate support Tony Lindgren
2019-10-13 11:26 ` Pavel Machek
2019-10-16 22:45 ` [PATCH 0/5] cpcap battery simplification and " Tony Lindgren
2019-10-20 20:36 ` Sebastian Reichel
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=20191009210621.10522-3-tony@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=merlijn@wizzup.org \
--cc=pavel@ucw.cz \
--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).