From: Liam Beguin <liambeguin@gmail.com>
To: liambeguin@gmail.com, peda@axentia.se, jic23@kernel.org,
andy.shevchenko@gmail.com, lars@metafoo.de
Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
devicetree@vger.kernel.org, robh+dt@kernel.org
Subject: [PATCH v12 11/16] iio: afe: rescale: make use of units.h
Date: Sat, 8 Jan 2022 15:53:14 -0500 [thread overview]
Message-ID: <20220108205319.2046348-12-liambeguin@gmail.com> (raw)
In-Reply-To: <20220108205319.2046348-1-liambeguin@gmail.com>
Make use of well-defined SI metric prefixes to improve code readability.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
---
drivers/iio/afe/iio-rescale.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index 5b87965482d2..2379da74fe23 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -50,11 +50,11 @@ int rescale_process_scale(struct rescale *rescale, int scale_type,
}
fallthrough;
case IIO_VAL_FRACTIONAL_LOG2:
- tmp = (s64)*val * 1000000000LL;
+ tmp = (s64)*val * GIGA;
tmp = div_s64(tmp, rescale->denominator);
tmp *= rescale->numerator;
- tmp = div_s64_rem(tmp, 1000000000LL, &rem);
+ tmp = div_s64_rem(tmp, GIGA, &rem);
*val = tmp;
if (!rem)
@@ -70,7 +70,7 @@ int rescale_process_scale(struct rescale *rescale, int scale_type,
*val2 = rem / (int)tmp;
if (rem2)
- *val2 += div_s64((s64)rem2 * 1000000000LL, tmp);
+ *val2 += div_s64((s64)rem2 * GIGA, tmp);
return IIO_VAL_INT_PLUS_NANO;
case IIO_VAL_INT_PLUS_NANO:
@@ -331,8 +331,8 @@ static int rescale_current_sense_amplifier_props(struct device *dev,
* gain_div / (gain_mult * sense), while trying to keep the
* numerator/denominator from overflowing.
*/
- factor = gcd(sense, 1000000);
- rescale->numerator = 1000000 / factor;
+ factor = gcd(sense, MEGA);
+ rescale->numerator = MEGA / factor;
rescale->denominator = sense / factor;
factor = gcd(rescale->numerator, gain_mult);
@@ -360,8 +360,8 @@ static int rescale_current_sense_shunt_props(struct device *dev,
return ret;
}
- factor = gcd(shunt, 1000000);
- rescale->numerator = 1000000 / factor;
+ factor = gcd(shunt, MEGA);
+ rescale->numerator = MEGA / factor;
rescale->denominator = shunt / factor;
return 0;
--
2.34.0
next prev parent reply other threads:[~2022-01-08 20:53 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-08 20:53 [PATCH v12 00/16] iio: afe: add temperature rescaling support Liam Beguin
2022-01-08 20:53 ` [PATCH v12 01/16] iio: inkern: apply consumer scale on IIO_VAL_INT cases Liam Beguin
2022-01-08 20:53 ` [PATCH v12 02/16] iio: inkern: apply consumer scale when no channel scale is available Liam Beguin
2022-01-08 20:53 ` [PATCH v12 03/16] iio: inkern: make a best effort on offset calculation Liam Beguin
2022-01-08 20:53 ` [PATCH v12 04/16] iio: afe: rescale: use s64 for temporary scale calculations Liam Beguin
2022-01-08 20:53 ` [PATCH v12 05/16] iio: afe: rescale: reorder includes Liam Beguin
2022-01-08 20:53 ` [PATCH v12 06/16] iio: afe: rescale: expose scale processing function Liam Beguin
2022-01-09 13:07 ` Andy Shevchenko
2022-01-09 20:19 ` Peter Rosin
2022-01-09 20:25 ` Peter Rosin
2022-01-11 14:43 ` Liam Beguin
2022-01-11 14:35 ` Liam Beguin
2022-01-08 20:53 ` [PATCH v12 07/16] iio: afe: rescale: add INT_PLUS_{MICRO,NANO} support Liam Beguin
2022-01-09 12:48 ` Andy Shevchenko
2022-01-09 20:20 ` Peter Rosin
2022-01-11 14:33 ` Liam Beguin
2022-01-08 20:53 ` [PATCH v12 08/16] iio: afe: rescale: add offset support Liam Beguin
2022-01-08 20:53 ` [PATCH v12 09/16] iio: afe: rescale: fix accuracy for small fractional scales Liam Beguin
2022-01-09 13:02 ` Andy Shevchenko
2022-01-09 20:07 ` Peter Rosin
2022-01-08 20:53 ` [PATCH v12 10/16] iio: afe: rescale: reduce risk of integer overflow Liam Beguin
2022-01-08 20:53 ` Liam Beguin [this message]
2022-01-08 20:53 ` [PATCH v12 12/16] iio: test: add basic tests for the iio-rescale driver Liam Beguin
2022-01-08 20:53 ` [PATCH v12 13/16] iio: afe: rescale: add RTD temperature sensor support Liam Beguin
2022-01-08 20:53 ` [PATCH v12 14/16] iio: afe: rescale: add temperature transducers Liam Beguin
2022-01-08 20:53 ` [PATCH v12 15/16] dt-bindings: iio: afe: add bindings for temperature-sense-rtd Liam Beguin
2022-01-08 20:53 ` [PATCH v12 16/16] dt-bindings: iio: afe: add bindings for temperature transducers Liam Beguin
2022-01-09 13:10 ` [PATCH v12 00/16] iio: afe: add temperature rescaling support Andy Shevchenko
2022-01-30 14:39 ` Jonathan Cameron
2022-01-30 14:41 ` Jonathan Cameron
2022-01-30 14:59 ` Liam Beguin
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=20220108205319.2046348-12-liambeguin@gmail.com \
--to=liambeguin@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peda@axentia.se \
--cc=robh+dt@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).