From: Sean Anderson <sean.anderson@linux.dev>
To: Jonathan Cameron <jic23@kernel.org>,
Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
linux-iio@vger.kernel.org, linux-hwmon@vger.kernel.org
Cc: "Andy Shevchenko" <andy@kernel.org>,
"Nuno Sá" <nuno.sa@analog.com>,
linux-kernel@vger.kernel.org,
"David Lechner" <dlechner@baylibre.com>,
"Sean Anderson" <sean.anderson@linux.dev>
Subject: [PATCH 4/7] hwmon: iio: Refactor scale calculation into helper
Date: Mon, 14 Jul 2025 21:20:20 -0400 [thread overview]
Message-ID: <20250715012023.2050178-5-sean.anderson@linux.dev> (raw)
In-Reply-To: <20250715012023.2050178-1-sean.anderson@linux.dev>
Add a function to determine the scale parameter, since it will soon be
used in several places.
Signed-off-by: Sean Anderson <sean.anderson@linux.dev>
---
drivers/hwmon/iio_hwmon.c | 40 ++++++++++++++++++++++++++++-----------
1 file changed, 29 insertions(+), 11 deletions(-)
diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
index e376d4cde5ad..bba8919377eb 100644
--- a/drivers/hwmon/iio_hwmon.c
+++ b/drivers/hwmon/iio_hwmon.c
@@ -44,6 +44,30 @@ static ssize_t iio_hwmon_read_label(struct device *dev,
return iio_read_channel_label(chan, buf);
}
+/**
+ * iio_hwmon_scale() - Look up the scaling factor for a channel
+ * @chan: Channel to get the scale of
+ *
+ * Determine the scale to use with @chan in the case where IIO and HWMON use
+ * different units.
+ *
+ * Return: scale of @chan
+ */
+static int iio_hwmon_scale(struct iio_channel *chan)
+{
+ enum iio_chan_type type;
+ int ret;
+
+ ret = iio_get_channel_type(chan, &type);
+ if (ret < 0)
+ return ret;
+
+ /* mili-Watts to micro-Watts conversion */
+ if (type == IIO_POWER)
+ return 1000;
+ return 1;
+}
+
/*
* Assumes that IIO and hwmon operate in the same base units.
* This is supposed to be true, but needs verification for
@@ -53,22 +77,16 @@ static ssize_t iio_hwmon_read_val(struct device *dev,
struct device_attribute *attr,
char *buf)
{
- int result;
- int ret;
struct sensor_device_attribute *sattr = to_sensor_dev_attr(attr);
struct iio_hwmon_state *state = dev_get_drvdata(dev);
struct iio_channel *chan = &state->channels[sattr->index];
- enum iio_chan_type type;
+ int ret, result, scale;
- ret = iio_get_channel_type(chan, &type);
- if (ret < 0)
- return ret;
+ scale = iio_hwmon_scale(chan);
+ if (scale < 0)
+ return scale;
- if (type == IIO_POWER)
- /* mili-Watts to micro-Watts conversion */
- ret = iio_read_channel_processed_scale(chan, &result, 1000);
- else
- ret = iio_read_channel_processed(chan, &result);
+ ret = iio_read_channel_processed_scale(chan, &result, scale);
if (ret < 0)
return ret;
--
2.35.1.1320.gc452695387.dirty
next prev parent reply other threads:[~2025-07-15 1:20 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-15 1:20 [PATCH 0/7] hwmon: iio: Add alarm support Sean Anderson
2025-07-15 1:20 ` [PATCH 1/7] math64: Add div64_s64_rem Sean Anderson
2025-07-15 8:03 ` Andy Shevchenko
2025-07-15 17:36 ` Sean Anderson
2025-07-16 10:15 ` Andy Shevchenko
2025-07-15 1:20 ` [PATCH 2/7] iio: inkern: Add API for reading/writing events Sean Anderson
2025-07-15 8:18 ` Andy Shevchenko
2025-07-15 15:42 ` Sean Anderson
2025-07-16 9:28 ` Andy Shevchenko
2025-07-17 16:42 ` Sean Anderson
2025-07-27 15:55 ` Jonathan Cameron
2025-07-15 10:35 ` Nuno Sá
2025-07-15 15:43 ` Sean Anderson
2025-07-16 6:23 ` Nuno Sá
2025-07-27 16:13 ` Jonathan Cameron
2025-07-15 1:20 ` [PATCH 3/7] iio: Add in-kernel API for events Sean Anderson
2025-07-15 8:20 ` Andy Shevchenko
2025-07-15 15:47 ` Sean Anderson
2025-07-16 9:47 ` Andy Shevchenko
2025-07-15 11:09 ` Nuno Sá
2025-07-15 16:52 ` Sean Anderson
2025-07-27 16:21 ` Jonathan Cameron
2025-07-28 22:44 ` Sean Anderson
2025-07-29 18:33 ` Jonathan Cameron
2025-07-29 20:09 ` Sean Anderson
2025-07-31 12:59 ` Jonathan Cameron
2025-07-27 16:24 ` Jonathan Cameron
2025-07-15 1:20 ` Sean Anderson [this message]
2025-07-15 8:35 ` [PATCH 4/7] hwmon: iio: Refactor scale calculation into helper Andy Shevchenko
2025-07-15 1:20 ` [PATCH 5/7] hwmon: iio: Add helper function for creating attributes Sean Anderson
2025-07-15 8:38 ` Andy Shevchenko
2025-07-15 15:55 ` Sean Anderson
2025-07-16 10:00 ` Andy Shevchenko
2025-07-27 16:31 ` Jonathan Cameron
2025-07-15 1:20 ` [PATCH 6/7] hwmon: iio: Add min/max support Sean Anderson
2025-07-15 8:41 ` Andy Shevchenko
2025-07-15 16:05 ` Sean Anderson
2025-07-16 10:01 ` Andy Shevchenko
2025-07-17 16:11 ` Sean Anderson
2025-07-27 16:35 ` Jonathan Cameron
2025-07-28 22:32 ` Sean Anderson
2025-07-29 18:37 ` Jonathan Cameron
2025-07-15 1:20 ` [PATCH 7/7] hwmon: iio: Add alarm support Sean Anderson
2025-07-15 8:50 ` Andy Shevchenko
2025-07-15 16:20 ` Sean Anderson
2025-07-16 10:08 ` Andy Shevchenko
2025-07-17 16:23 ` Sean Anderson
2025-07-21 7:42 ` Andy Shevchenko
2025-07-21 14:24 ` Sean Anderson
2025-07-15 11:28 ` Nuno Sá
2025-07-15 17:02 ` Sean Anderson
2025-07-15 19:26 ` Guenter Roeck
2025-07-15 19:40 ` Sean Anderson
2025-07-16 6:37 ` Nuno Sá
2025-07-17 16:00 ` Sean Anderson
2025-07-31 10:52 ` Nuno Sá
2025-08-02 10:53 ` Jonathan Cameron
2025-07-15 16:13 ` kernel test robot
2025-07-15 19:34 ` Guenter Roeck
2025-07-15 20:08 ` Sean Anderson
2025-07-16 7:44 ` kernel test robot
2025-07-27 16:50 ` 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=20250715012023.2050178-5-sean.anderson@linux.dev \
--to=sean.anderson@linux.dev \
--cc=andy@kernel.org \
--cc=dlechner@baylibre.com \
--cc=jdelvare@suse.com \
--cc=jic23@kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=nuno.sa@analog.com \
/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).