From: Krzysztof Adamski <krzysztof.adamski@nokia.com>
To: Guenter Roeck <linux@roeck-us.net>, Jean Delvare <jdelvare@suse.com>
Cc: Rob Herring <robh+dt@kernel.org>,
linux-hwmon@vger.kernel.org, devicetree@vger.kernel.org,
Przemyslaw Cencner <przemyslaw.cencner@nokia.com>
Subject: [PATCH v2 03/10] hwmon: (tmp421) introduce a channel struct
Date: Fri, 24 Sep 2021 11:39:19 +0200 [thread overview]
Message-ID: <cc28847a4302bbcd6088f83f6ece71a9309590d5.1632473318.git.krzysztof.adamski@nokia.com> (raw)
In-Reply-To: <cover.1632473318.git.krzysztof.adamski@nokia.com>
This is a preparatory change. Upcoming patches will introduce more
per-channel parameters so it's worth organizing them into a struct.
Signed-off-by: Krzysztof Adamski <krzysztof.adamski@nokia.com>
---
drivers/hwmon/tmp421.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/hwmon/tmp421.c b/drivers/hwmon/tmp421.c
index 2c9ba5fe5f2a..1068fe59df0b 100644
--- a/drivers/hwmon/tmp421.c
+++ b/drivers/hwmon/tmp421.c
@@ -87,6 +87,10 @@ static const struct of_device_id __maybe_unused tmp421_of_match[] = {
};
MODULE_DEVICE_TABLE(of, tmp421_of_match);
+struct tmp421_channel {
+ s16 temp;
+};
+
struct tmp421_data {
struct i2c_client *client;
struct mutex update_lock;
@@ -98,7 +102,7 @@ struct tmp421_data {
unsigned long last_updated;
unsigned long channels;
u8 config;
- s16 temp[MAX_CHANNELS];
+ struct tmp421_channel channel[MAX_CHANNELS];
};
static int temp_from_s16(s16 reg)
@@ -134,9 +138,9 @@ static struct tmp421_data *tmp421_update_device(struct device *dev)
TMP421_CONFIG_REG_1);
for (i = 0; i < data->channels; i++) {
- data->temp[i] = i2c_smbus_read_byte_data(client,
+ data->channel[i].temp = i2c_smbus_read_byte_data(client,
TMP421_TEMP_MSB[i]) << 8;
- data->temp[i] |= i2c_smbus_read_byte_data(client,
+ data->channel[i].temp |= i2c_smbus_read_byte_data(client,
TMP421_TEMP_LSB[i]);
}
data->last_updated = jiffies;
@@ -156,16 +160,16 @@ static int tmp421_read(struct device *dev, enum hwmon_sensor_types type,
switch (attr) {
case hwmon_temp_input:
if (tmp421->config & TMP421_CONFIG_RANGE)
- *val = temp_from_u16(tmp421->temp[channel]);
+ *val = temp_from_u16(tmp421->channel[channel].temp);
else
- *val = temp_from_s16(tmp421->temp[channel]);
+ *val = temp_from_s16(tmp421->channel[channel].temp);
return 0;
case hwmon_temp_fault:
/*
* The OPEN bit signals a fault. This is bit 0 of the temperature
* register (low byte).
*/
- *val = tmp421->temp[channel] & 0x01;
+ *val = tmp421->channel[channel].temp & 0x01;
return 0;
default:
return -EOPNOTSUPP;
--
2.31.1
next prev parent reply other threads:[~2021-09-24 9:39 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-24 9:36 [PATCH v2 00/10] Add per channel properies support in tmp421 Krzysztof Adamski
2021-09-24 9:38 ` [PATCH v2 01/10] dt-bindings: hwmon: add missing tmp421 binding Krzysztof Adamski
2021-09-24 12:45 ` Rob Herring
2021-09-24 12:54 ` Krzysztof Adamski
2021-09-24 9:39 ` [PATCH v2 02/10] hwmon: (tmp421) introduce MAX_CHANNELS define Krzysztof Adamski
2021-09-24 12:05 ` Guenter Roeck
2021-09-24 9:39 ` Krzysztof Adamski [this message]
2021-09-24 9:39 ` [PATCH v2 04/10] hwmon: (tmp421) add support for defining labels from DT Krzysztof Adamski
2021-09-24 12:17 ` Guenter Roeck
2021-09-24 12:27 ` Krzysztof Adamski
2021-09-24 9:40 ` [PATCH v2 05/10] hwmon: (tmp421) support disabling channels " Krzysztof Adamski
2021-09-24 9:40 ` [PATCH v2 06/10] hwmon: (tmp421) support specifying n-factor via DT Krzysztof Adamski
2021-09-24 9:42 ` [PATCH v2 07/10] hwmon: (tmp421) really disable channels Krzysztof Adamski
2021-09-24 12:12 ` Guenter Roeck
2021-09-24 9:43 ` [PATCH v2 08/10] hwmon: (tmp421) support HWMON_T_ENABLE Krzysztof Adamski
2021-09-24 9:44 ` [PATCH v2 09/10] hwmon: (tmp421) update documentation Krzysztof Adamski
2021-09-24 9:44 ` [PATCH v2 10/10] dt-bindings: hwmon: allow specifying channels for tmp421 Krzysztof Adamski
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=cc28847a4302bbcd6088f83f6ece71a9309590d5.1632473318.git.krzysztof.adamski@nokia.com \
--to=krzysztof.adamski@nokia.com \
--cc=devicetree@vger.kernel.org \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=przemyslaw.cencner@nokia.com \
--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).