[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220130161101.1067691-7-liambeguin@gmail.com>
Date: Sun, 30 Jan 2022 11:10:56 -0500
From: Liam Beguin <liambeguin@...il.com>
To: liambeguin@...il.com, peda@...ntia.se, jic23@...nel.org,
andy.shevchenko@...il.com, lars@...afoo.de
Cc: linux-kernel@...r.kernel.org, linux-iio@...r.kernel.org,
devicetree@...r.kernel.org, robh+dt@...nel.org
Subject: [PATCH v13 06/11] iio: afe: rescale: make use of units.h
Make use of well-defined SI metric prefixes to improve code readability.
Signed-off-by: Liam Beguin <liambeguin@...il.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 67273de46843..27c6664915ff 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -51,11 +51,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)
@@ -71,7 +71,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:
@@ -332,8 +332,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);
@@ -361,8 +361,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.35.1.4.g5d01301f2b86
Powered by blists - more mailing lists