| Message ID | DB4PR10MB6261B507C7656E3568DA33E39258A@DB4PR10MB6261.EURPRD10.PROD.OUTLOOK.COM (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/6] hwmon: (sht3x) remove sht3x_platform_data | expand |
On Sat, Jun 17, 2023 at 12:00:16AM +0800, JuenKit Yip wrote: > add "repeatability" interface to sysfs, it could be > read or written to control the sensor. > > Signed-off-by: JuenKit Yip <JuenKit_Yip@hotmail.com> Checkpatch: CHECK: Alignment should match open parenthesis #149: FILE: drivers/hwmon/sht3x.c:650: +static ssize_t repeatability_store(struct device *dev, + struct device_attribute *attr, Another comment inline below. I fixed that up, no need to resend. But please keep it in mind for future patches. Thanks, Guenter > --- > Documentation/hwmon/sht3x.rst | 12 +++++++----- > drivers/hwmon/sht3x.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 40 insertions(+), 5 deletions(-) > > diff --git a/Documentation/hwmon/sht3x.rst b/Documentation/hwmon/sht3x.rst > index b4aa561f0..87864ffd1 100644 > --- a/Documentation/hwmon/sht3x.rst > +++ b/Documentation/hwmon/sht3x.rst > @@ -28,11 +28,6 @@ The device communicates with the I2C protocol. Sensors can have the I2C > addresses 0x44 or 0x45, depending on the wiring. See > Documentation/i2c/instantiating-devices.rst for methods to instantiate the device. > > -There is only one option configurable by means of sht3x_data: > - > - repeatability: high repeatability is used by default and using it is > - strongly recommended. > - > Even if sht3x sensor supports clock-strech(blocking mode) and non-strench > (non-blocking mode) in single-shot mode, this driver only supports the latter. > > @@ -83,4 +78,11 @@ heater_enable: heater enable, heating element removes excess humidity from > update_interval: update interval, 0 for single shot, interval in msec > for periodic measurement. If the interval is not supported > by the sensor, the next faster interval is chosen > +repeatability: write or read repeatability, higher repeatability means > + longer measurement duration, lower noise level and > + larger energy consumption: > + > + - 0: low repeatability > + - 1: medium repeatability > + - 2: high repeatability > =================== ============================================================ > diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c > index 6174b8fa7..adfc11c12 100644 > --- a/drivers/hwmon/sht3x.c > +++ b/drivers/hwmon/sht3x.c > @@ -637,6 +637,37 @@ static ssize_t update_interval_store(struct device *dev, > return count; > } > > +static ssize_t repeatability_show(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct sht3x_data *data = dev_get_drvdata(dev); > + > + return sysfs_emit(buf, "%d\n", data->repeatability); > +} > + > +static ssize_t repeatability_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, > + size_t count) > +{ > + u8 val; > + int ret; > + > + struct sht3x_data *data = dev_get_drvdata(dev); > + > + ret = kstrtou8(buf, 0, &val); > + if (ret) > + return ret; > + > + if (val < 0 || val > 2) > + return -EINVAL; > + > + data->repeatability = val; > + > + return count; > +} > + > static SENSOR_DEVICE_ATTR_RO(temp1_input, temp1_input, 0); > static SENSOR_DEVICE_ATTR_RO(humidity1_input, humidity1_input, 0); > static SENSOR_DEVICE_ATTR_RW(temp1_max, temp1_limit, limit_max); > @@ -653,6 +684,7 @@ static SENSOR_DEVICE_ATTR_RO(temp1_alarm, temp1_alarm, 0); > static SENSOR_DEVICE_ATTR_RO(humidity1_alarm, humidity1_alarm, 0); > static SENSOR_DEVICE_ATTR_RW(heater_enable, heater_enable, 0); > static SENSOR_DEVICE_ATTR_RW(update_interval, update_interval, 0); > +static SENSOR_DEVICE_ATTR_RW(repeatability, repeatability, 0); > > static struct attribute *sht3x_attrs[] = { > &sensor_dev_attr_temp1_input.dev_attr.attr, > @@ -669,6 +701,7 @@ static struct attribute *sht3x_attrs[] = { > &sensor_dev_attr_humidity1_alarm.dev_attr.attr, > &sensor_dev_attr_heater_enable.dev_attr.attr, > &sensor_dev_attr_update_interval.dev_attr.attr, > + &sensor_dev_attr_repeatability.dev_attr.attr, > NULL > }; >
diff --git a/Documentation/hwmon/sht3x.rst b/Documentation/hwmon/sht3x.rst index b4aa561f0..87864ffd1 100644 --- a/Documentation/hwmon/sht3x.rst +++ b/Documentation/hwmon/sht3x.rst @@ -28,11 +28,6 @@ The device communicates with the I2C protocol. Sensors can have the I2C addresses 0x44 or 0x45, depending on the wiring. See Documentation/i2c/instantiating-devices.rst for methods to instantiate the device. -There is only one option configurable by means of sht3x_data: - - repeatability: high repeatability is used by default and using it is - strongly recommended. - Even if sht3x sensor supports clock-strech(blocking mode) and non-strench (non-blocking mode) in single-shot mode, this driver only supports the latter. @@ -83,4 +78,11 @@ heater_enable: heater enable, heating element removes excess humidity from update_interval: update interval, 0 for single shot, interval in msec for periodic measurement. If the interval is not supported by the sensor, the next faster interval is chosen +repeatability: write or read repeatability, higher repeatability means + longer measurement duration, lower noise level and + larger energy consumption: + + - 0: low repeatability + - 1: medium repeatability + - 2: high repeatability =================== ============================================================ diff --git a/drivers/hwmon/sht3x.c b/drivers/hwmon/sht3x.c index 6174b8fa7..adfc11c12 100644 --- a/drivers/hwmon/sht3x.c +++ b/drivers/hwmon/sht3x.c @@ -637,6 +637,37 @@ static ssize_t update_interval_store(struct device *dev, return count; } +static ssize_t repeatability_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct sht3x_data *data = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%d\n", data->repeatability); +} + +static ssize_t repeatability_store(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) +{ + u8 val; + int ret; + + struct sht3x_data *data = dev_get_drvdata(dev); + + ret = kstrtou8(buf, 0, &val); + if (ret) + return ret; + + if (val < 0 || val > 2) + return -EINVAL; + + data->repeatability = val; + + return count; +} + static SENSOR_DEVICE_ATTR_RO(temp1_input, temp1_input, 0); static SENSOR_DEVICE_ATTR_RO(humidity1_input, humidity1_input, 0); static SENSOR_DEVICE_ATTR_RW(temp1_max, temp1_limit, limit_max); @@ -653,6 +684,7 @@ static SENSOR_DEVICE_ATTR_RO(temp1_alarm, temp1_alarm, 0); static SENSOR_DEVICE_ATTR_RO(humidity1_alarm, humidity1_alarm, 0); static SENSOR_DEVICE_ATTR_RW(heater_enable, heater_enable, 0); static SENSOR_DEVICE_ATTR_RW(update_interval, update_interval, 0); +static SENSOR_DEVICE_ATTR_RW(repeatability, repeatability, 0); static struct attribute *sht3x_attrs[] = { &sensor_dev_attr_temp1_input.dev_attr.attr, @@ -669,6 +701,7 @@ static struct attribute *sht3x_attrs[] = { &sensor_dev_attr_humidity1_alarm.dev_attr.attr, &sensor_dev_attr_heater_enable.dev_attr.attr, &sensor_dev_attr_update_interval.dev_attr.attr, + &sensor_dev_attr_repeatability.dev_attr.attr, NULL };
add "repeatability" interface to sysfs, it could be read or written to control the sensor. Signed-off-by: JuenKit Yip <JuenKit_Yip@hotmail.com> --- Documentation/hwmon/sht3x.rst | 12 +++++++----- drivers/hwmon/sht3x.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-)