devicetree.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,
	lars@metafoo.de, pmeerw@pmeerw.net
Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
	devicetree@vger.kernel.org, robh+dt@kernel.org
Subject: [PATCH v1 3/9] iio: afe: rescale: use core to get processed value
Date: Sat, 29 May 2021 20:59:11 -0400	[thread overview]
Message-ID: <20210530005917.20953-4-liambeguin@gmail.com> (raw)
In-Reply-To: <20210530005917.20953-1-liambeguin@gmail.com>

From: Liam Beguin <lvb@xiphos.com>

Make use of the IIO core to compute the source channel's processed
value. This reduces duplication and will facilitate the addition of
offsets in the iio-rescale driver.

Signed-off-by: Liam Beguin <lvb@xiphos.com>
---
 drivers/iio/afe/iio-rescale.c | 37 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/drivers/iio/afe/iio-rescale.c b/drivers/iio/afe/iio-rescale.c
index e42ea2b1707d..4d0813b274d1 100644
--- a/drivers/iio/afe/iio-rescale.c
+++ b/drivers/iio/afe/iio-rescale.c
@@ -38,36 +38,20 @@ static int rescale_read_raw(struct iio_dev *indio_dev,
 			    int *val, int *val2, long mask)
 {
 	struct rescale *rescale = iio_priv(indio_dev);
-	unsigned long long tmp;
 	int ret;
 
 	switch (mask) {
 	case IIO_CHAN_INFO_RAW:
-		return iio_read_channel_raw(rescale->source, val);
+		ret = iio_read_channel_processed(rescale->source, val);
 
+		return IIO_VAL_INT;
 	case IIO_CHAN_INFO_SCALE:
-		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 = *val * 1000000000LL;
-			do_div(tmp, rescale->denominator);
-			tmp *= rescale->numerator;
-			do_div(tmp, 1000000000LL);
-			*val = tmp;
-			return ret;
-		default:
-			return -EOPNOTSUPP;
-		}
+		*val = rescale->numerator;
+		if (rescale->denominator == 1)
+			return IIO_VAL_INT;
+		*val2 = rescale->denominator;
+
+		return IIO_VAL_FRACTIONAL;
 	default:
 		return -EINVAL;
 	}
@@ -130,9 +114,8 @@ static int rescale_configure_channel(struct device *dev,
 	chan->ext_info = rescale->ext_info;
 	chan->type = rescale->cfg->type;
 
-	if (!iio_channel_has_info(schan, IIO_CHAN_INFO_RAW) ||
-	    !iio_channel_has_info(schan, IIO_CHAN_INFO_SCALE)) {
-		dev_err(dev, "source channel does not support raw/scale\n");
+	if (!iio_channel_has_info(schan, IIO_CHAN_INFO_RAW)) {
+		dev_err(dev, "source channel does not support raw\n");
 		return -EINVAL;
 	}
 
-- 
2.30.1.489.g328c10930387


  parent reply	other threads:[~2021-05-30  0:59 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-30  0:59 [PATCH v1 0/9] iio: afe: add temperature rescaling support Liam Beguin
2021-05-30  0:59 ` [PATCH v1 1/9] iio: inkern: always apply scale requested by consumer Liam Beguin
2021-05-31 13:39   ` Peter Rosin
2021-05-30  0:59 ` [PATCH v1 2/9] iio: inkern: error out on unsupported offset type Liam Beguin
2021-05-31  9:45   ` Peter Rosin
2021-05-31 13:31     ` Liam Beguin
2021-05-30  0:59 ` Liam Beguin [this message]
2021-05-31  7:09   ` [PATCH v1 3/9] iio: afe: rescale: use core to get processed value Peter Rosin
2021-05-31 13:23     ` Liam Beguin
2021-06-01 16:22   ` Jonathan Cameron
2021-05-30  0:59 ` [PATCH v1 4/9] iio: afe: rescale: add offset support Liam Beguin
2021-05-31  8:52   ` Peter Rosin
2021-05-31 13:36     ` Liam Beguin
2021-05-31 14:08       ` Peter Rosin
2021-05-31 14:51         ` Liam Beguin
2021-05-31 16:25           ` Peter Rosin
2021-05-31 17:42             ` Liam Beguin
2021-06-01 16:31               ` Jonathan Cameron
2021-05-30  0:59 ` [PATCH v1 5/9] iio: afe: rescale: add support for temperature sensors Liam Beguin
2021-06-01 16:34   ` Jonathan Cameron
2021-05-30  0:59 ` [PATCH v1 6/9] dt-bindings: iio: afe: update MAINTAINERS file Liam Beguin
2021-05-31  7:57   ` Peter Rosin
2021-05-30  0:59 ` [PATCH v1 7/9] dt-bindings: iio: afe: add binding for temperature-sense-rtd Liam Beguin
2021-06-01 16:43   ` Jonathan Cameron
2021-06-04 21:17   ` Rob Herring
2021-06-05 14:58     ` Jonathan Cameron
2021-05-30  0:59 ` [PATCH v1 8/9] dt-bindings: iio: afe: add binding for temperature-sense-current Liam Beguin
2021-05-31  7:28   ` Peter Rosin
2021-05-31  8:58     ` Peter Rosin
2021-05-31 13:41       ` Liam Beguin
2021-06-01 16:47   ` Jonathan Cameron
2021-06-04 21:21   ` Rob Herring
2021-05-30  0:59 ` [PATCH v1 9/9] dt-bindings: iio: afe: add binding for temperature-sense-amplifier Liam Beguin
2021-05-31  7:32   ` Peter Rosin
2021-05-31 14:03     ` Liam Beguin
2021-06-01 16:02       ` Jonathan Cameron
2021-06-01 16:07         ` Jonathan Cameron
2021-06-01 15:59   ` Jonathan Cameron

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=20210530005917.20953-4-liambeguin@gmail.com \
    --to=liambeguin@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=pmeerw@pmeerw.net \
    --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).