| Message ID | 20230214220221.15003-3-leonard.anderweit@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: (aquacomputer_d5next) Add Aquacomputer Aquaero control | expand |
On Tue, Feb 14, 2023 at 11:02:17PM +0100, Leonard Anderweit wrote: > Add new function aqc_set_ctrl_vals() to support changing multiple control > values at once while sending only one control report. > > Signed-off-by: Leonard Anderweit <leonard.anderweit@gmail.com> Applied. Thanks, Guenter > --- > drivers/hwmon/aquacomputer_d5next.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c > index babfd998e70c..f0c036d38e91 100644 > --- a/drivers/hwmon/aquacomputer_d5next.c > +++ b/drivers/hwmon/aquacomputer_d5next.c > @@ -574,9 +574,9 @@ static int aqc_get_ctrl_val(struct aqc_data *priv, int offset, long *val, int ty > return ret; > } > > -static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int type) > +static int aqc_set_ctrl_vals(struct aqc_data *priv, int *offsets, long *vals, int *types, int len) > { > - int ret; > + int ret, i; > > mutex_lock(&priv->mutex); > > @@ -584,15 +584,17 @@ static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int typ > if (ret < 0) > goto unlock_and_return; > > - switch (type) { > - case AQC_BE16: > - put_unaligned_be16((s16)val, priv->buffer + offset); > - break; > - case AQC_8: > - priv->buffer[offset] = (u8)val; > - break; > - default: > - ret = -EINVAL; > + for (i = 0; i < len; i++) { > + switch (types[i]) { > + case AQC_BE16: > + put_unaligned_be16((s16)vals[i], priv->buffer + offsets[i]); > + break; > + case AQC_8: > + priv->buffer[offsets[i]] = (u8)vals[i]; > + break; > + default: > + ret = -EINVAL; > + } > } > > if (ret < 0) > @@ -605,6 +607,11 @@ static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int typ > return ret; > } > > +static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int type) > +{ > + return aqc_set_ctrl_vals(priv, &offset, &val, &type, 1); > +} > + > static umode_t aqc_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, int channel) > { > const struct aqc_data *priv = data;
diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c index babfd998e70c..f0c036d38e91 100644 --- a/drivers/hwmon/aquacomputer_d5next.c +++ b/drivers/hwmon/aquacomputer_d5next.c @@ -574,9 +574,9 @@ static int aqc_get_ctrl_val(struct aqc_data *priv, int offset, long *val, int ty return ret; } -static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int type) +static int aqc_set_ctrl_vals(struct aqc_data *priv, int *offsets, long *vals, int *types, int len) { - int ret; + int ret, i; mutex_lock(&priv->mutex); @@ -584,15 +584,17 @@ static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int typ if (ret < 0) goto unlock_and_return; - switch (type) { - case AQC_BE16: - put_unaligned_be16((s16)val, priv->buffer + offset); - break; - case AQC_8: - priv->buffer[offset] = (u8)val; - break; - default: - ret = -EINVAL; + for (i = 0; i < len; i++) { + switch (types[i]) { + case AQC_BE16: + put_unaligned_be16((s16)vals[i], priv->buffer + offsets[i]); + break; + case AQC_8: + priv->buffer[offsets[i]] = (u8)vals[i]; + break; + default: + ret = -EINVAL; + } } if (ret < 0) @@ -605,6 +607,11 @@ static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int typ return ret; } +static int aqc_set_ctrl_val(struct aqc_data *priv, int offset, long val, int type) +{ + return aqc_set_ctrl_vals(priv, &offset, &val, &type, 1); +} + static umode_t aqc_is_visible(const void *data, enum hwmon_sensor_types type, u32 attr, int channel) { const struct aqc_data *priv = data;
Add new function aqc_set_ctrl_vals() to support changing multiple control values at once while sending only one control report. Signed-off-by: Leonard Anderweit <leonard.anderweit@gmail.com> --- drivers/hwmon/aquacomputer_d5next.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)