linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 06/16] iio: afe: rescale: expose scale processing function
Date: Sat,  8 Jan 2022 15:53:09 -0500	[thread overview]
Message-ID: <20220108205319.2046348-7-liambeguin@gmail.com> (raw)
In-Reply-To: <20220108205319.2046348-1-liambeguin@gmail.com>

In preparation for the addition of kunit tests, expose the logic
responsible for combining channel scales.

Signed-off-by: Liam Beguin <liambeguin@gmail.com>
Reviewed-by: Peter Rosin <peda@axentia.se>
---
 drivers/iio/afe/iio-rescale.c   | 65 ++++++++++++++-------------------
 include/linux/iio/afe/rescale.h | 32 ++++++++++++++++
 2 files changed, 60 insertions(+), 37 deletions(-)
 create mode 100644 include/linux/iio/afe/rescale.h

diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index 69710c481376..65832dd09249 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -15,32 +15,43 @@
 #include <linux/platform_device.h>
 #include <linux/property.h>
 
+#include <linux/iio/afe/rescale.h>
 #include <linux/iio/consumer.h>
 #include <linux/iio/iio.h>
 
-struct rescale;
-
-struct rescale_cfg {
-	enum iio_chan_type type;
-	int (*props)(struct device *dev, struct rescale *rescale);
-};
+int rescale_process_scale(struct rescale *rescale, int scale_type,
+			  int *val, int *val2)
+{
+	s64 tmp;
 
-struct rescale {
-	const struct rescale_cfg *cfg;
-	struct iio_channel *source;
-	struct iio_chan_spec chan;
-	struct iio_chan_spec_ext_info *ext_info;
-	bool chan_processed;
-	s32 numerator;
-	s32 denominator;
-};
+	switch (scale_type) {
+	case IIO_VAL_FRACTIONAL:
+		*val *= rescale->numerator;
+		*val2 *= rescale->denominator;
+		return scale_type;
+	case IIO_VAL_INT:
+		*val *= rescale->numerator;
+		if (rescale->denominator == 1)
+			return scale_type;
+		*val2 = rescale->denominator;
+		return IIO_VAL_FRACTIONAL;
+	case IIO_VAL_FRACTIONAL_LOG2:
+		tmp = (s64)*val * 1000000000LL;
+		tmp = div_s64(tmp, rescale->denominator);
+		tmp *= rescale->numerator;
+		tmp = div_s64(tmp, 1000000000LL);
+		*val = tmp;
+		return scale_type;
+	default:
+		return -EOPNOTSUPP;
+	}
+}
 
 static int rescale_read_raw(struct iio_dev *indio_dev,
 			    struct iio_chan_spec const *chan,
 			    int *val, int *val2, long mask)
 {
 	struct rescale *rescale = iio_priv(indio_dev);
-	s64 tmp;
 	int ret;
 
 	switch (mask) {
@@ -66,27 +77,7 @@ static int rescale_read_raw(struct iio_dev *indio_dev,
 		} else {
 			ret = iio_read_channel_scale(rescale->source, val, val2);
 		}
-		switch (ret) {
-		case IIO_VAL_FRACTIONAL:
-			*val *= rescale->numerator;
-			*val2 *= rescale->denominator;
-			return ret;
-		case IIO_VAL_INT:
-			*val *= rescale->numerator;
-			if (rescale->denominator == 1)
-				return ret;
-			*val2 = rescale->denominator;
-			return IIO_VAL_FRACTIONAL;
-		case IIO_VAL_FRACTIONAL_LOG2:
-			tmp = (s64)*val * 1000000000LL;
-			tmp = div_s64(tmp, rescale->denominator);
-			tmp *= rescale->numerator;
-			tmp = div_s64(tmp, 1000000000LL);
-			*val = tmp;
-			return ret;
-		default:
-			return -EOPNOTSUPP;
-		}
+		return rescale_process_scale(rescale, ret, val, val2);
 	default:
 		return -EINVAL;
 	}
diff --git a/include/linux/iio/afe/rescale.h b/include/linux/iio/afe/rescale.h
new file mode 100644
index 000000000000..698092b6cbb1
--- /dev/null
+++ b/include/linux/iio/afe/rescale.h
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Copyright (C) 2021 Liam Beguin <liambeguin@gmail.com>
+ */
+
+#ifndef __IIO_RESCALE_H__
+#define __IIO_RESCALE_H__
+
+#include <linux/types.h>
+#include <linux/iio/iio.h>
+
+struct device;
+struct rescale;
+
+struct rescale_cfg {
+	enum iio_chan_type type;
+	int (*props)(struct device *dev, struct rescale *rescale);
+};
+
+struct rescale {
+	const struct rescale_cfg *cfg;
+	struct iio_channel *source;
+	struct iio_chan_spec chan;
+	struct iio_chan_spec_ext_info *ext_info;
+	bool chan_processed;
+	s32 numerator;
+	s32 denominator;
+};
+
+int rescale_process_scale(struct rescale *rescale, int scale_type,
+			  int *val, int *val2);
+#endif /* __IIO_RESCALE_H__ */
-- 
2.34.0


  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 ` Liam Beguin [this message]
2022-01-09 13:07   ` [PATCH v12 06/16] iio: afe: rescale: expose scale processing function 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 ` [PATCH v12 11/16] iio: afe: rescale: make use of units.h Liam Beguin
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-7-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).