From: Chris Packham <chris.packham@alliedtelesis.co.nz>
To: jdelvare@suse.com, linux@roeck-us.net
Cc: linux-hwmon@vger.kernel.org, linux-kernel@vger.kernel.org,
Chris Packham <chris.packham@alliedtelesis.co.nz>
Subject: [PATCH 2/2] hwmon: (adt7470) Use standard update_interval property
Date: Wed, 23 Jun 2021 12:20:58 +1200 [thread overview]
Message-ID: <20210623002058.3133-3-chris.packham@alliedtelesis.co.nz> (raw)
In-Reply-To: <20210623002058.3133-1-chris.packham@alliedtelesis.co.nz>
Instead of the non-standard auto_update_interval make use of the
update_interval property that is supported by the hwmon core.
Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
I kind of anticipate a NAK on this because it affects the ABI. But I figured
I'd run it past the ML to see if moving towards the hwmon core is work the hit
in ABI compatibility.
drivers/hwmon/adt7470.c | 64 +++++++++++++++++++++++++----------------
1 file changed, 39 insertions(+), 25 deletions(-)
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
index 24d210def09b..c0428ab532bb 100644
--- a/drivers/hwmon/adt7470.c
+++ b/drivers/hwmon/adt7470.c
@@ -461,35 +461,37 @@ static struct adt7470_data *adt7470_update_device(struct device *dev)
return err < 0 ? ERR_PTR(err) : data;
}
-static ssize_t auto_update_interval_show(struct device *dev,
- struct device_attribute *devattr,
- char *buf)
-{
- struct adt7470_data *data = adt7470_update_device(dev);
-
- if (IS_ERR(data))
- return PTR_ERR(data);
-
- return sprintf(buf, "%d\n", data->auto_update_interval);
-}
-
-static ssize_t auto_update_interval_store(struct device *dev,
- struct device_attribute *devattr,
- const char *buf, size_t count)
+static int adt7470_chip_read(struct device *dev, u32 attr, long *val)
{
struct adt7470_data *data = dev_get_drvdata(dev);
- long temp;
- if (kstrtol(buf, 10, &temp))
- return -EINVAL;
+ switch (attr) {
+ case hwmon_chip_update_interval:
+ *val = data->auto_update_interval;
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
- temp = clamp_val(temp, 0, 60000);
+ return 0;
+}
- mutex_lock(&data->lock);
- data->auto_update_interval = temp;
- mutex_unlock(&data->lock);
+static int adt7470_chip_write(struct device *dev, u32 attr, long val)
+{
+ struct adt7470_data *data = dev_get_drvdata(dev);
- return count;
+ switch (attr) {
+ case hwmon_chip_update_interval:
+ val = clamp_val(val, 0, 60000);
+ mutex_lock(&data->lock);
+ data->auto_update_interval = val;
+ mutex_unlock(&data->lock);
+ break;
+ default:
+ return -EOPNOTSUPP;
+ }
+
+ return 0;
}
static ssize_t num_temp_sensors_show(struct device *dev,
@@ -1017,7 +1019,6 @@ static ssize_t pwm_auto_temp_store(struct device *dev,
static DEVICE_ATTR_RW(alarm_mask);
static DEVICE_ATTR_RW(num_temp_sensors);
-static DEVICE_ATTR_RW(auto_update_interval);
static SENSOR_DEVICE_ATTR_RW(force_pwm_max, force_pwm_max, 0);
@@ -1049,7 +1050,6 @@ static SENSOR_DEVICE_ATTR_RW(pwm4_auto_channels_temp, pwm_auto_temp, 3);
static struct attribute *adt7470_attrs[] = {
&dev_attr_alarm_mask.attr,
&dev_attr_num_temp_sensors.attr,
- &dev_attr_auto_update_interval.attr,
&sensor_dev_attr_force_pwm_max.dev_attr.attr,
&sensor_dev_attr_pwm1_auto_point1_pwm.dev_attr.attr,
&sensor_dev_attr_pwm2_auto_point1_pwm.dev_attr.attr,
@@ -1080,6 +1080,8 @@ static int adt7470_read(struct device *dev, enum hwmon_sensor_types type, u32 at
int channel, long *val)
{
switch (type) {
+ case hwmon_chip:
+ return adt7470_chip_read(dev, attr, val);
case hwmon_temp:
return adt7470_temp_read(dev, attr, channel, val);
case hwmon_fan:
@@ -1095,6 +1097,8 @@ static int adt7470_write(struct device *dev, enum hwmon_sensor_types type, u32 a
int channel, long val)
{
switch (type) {
+ case hwmon_chip:
+ return adt7470_chip_write(dev, attr, val);
case hwmon_temp:
return adt7470_temp_write(dev, attr, channel, val);
case hwmon_fan:
@@ -1112,6 +1116,15 @@ static umode_t adt7470_is_visible(const void *_data, enum hwmon_sensor_types typ
umode_t mode = 0;
switch (type) {
+ case hwmon_chip:
+ switch (attr) {
+ case hwmon_chip_update_interval:
+ mode = 0644;
+ break;
+ default:
+ break;
+ }
+ break;
case hwmon_temp:
switch (attr) {
case hwmon_temp:
@@ -1170,6 +1183,7 @@ static const struct hwmon_ops adt7470_hwmon_ops = {
};
static const struct hwmon_channel_info *adt7470_info[] = {
+ HWMON_CHANNEL_INFO(chip, HWMON_C_UPDATE_INTERVAL),
HWMON_CHANNEL_INFO(temp,
HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | HWMON_T_ALARM,
HWMON_T_INPUT | HWMON_T_MIN | HWMON_T_MAX | HWMON_T_ALARM,
--
2.32.0
prev parent reply other threads:[~2021-06-23 0:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 0:20 [PATCH 0/2] hwmon: (adt7470) Clean up Chris Packham
2021-06-23 0:20 ` [PATCH 1/2] hwmon: (adt7470) Convert to devm_hwmon_device_register_with_info API Chris Packham
2021-08-24 21:07 ` Guenter Roeck
2021-08-24 21:15 ` Chris Packham
2021-06-23 0:20 ` Chris Packham [this message]
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=20210623002058.3133-3-chris.packham@alliedtelesis.co.nz \
--to=chris.packham@alliedtelesis.co.nz \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
/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).