| Message ID | 20210130102530.31064-1-xiang.ye@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] iio: hid-sensor-prox: Fix scale not correct issue | expand |
On Sat, 30 Jan 2021 18:25:30 +0800 Ye Xiang <xiang.ye@intel.com> wrote: > Currently, the proxy sensor scale is zero because it just return the > exponent directly. To fix this issue, this patch use > hid_sensor_format_scale to process the scale first then return the > output. > > Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") > Signed-off-by: Ye Xiang <xiang.ye@intel.com> Hi Ye Xiang, There was a bit of fuzz on this so please take a look at my fixes-togreg branch and check it went in cleanly. > --- > v2: > - Add Fixes tag > > --- > drivers/iio/light/hid-sensor-prox.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c > index 4ab285a418d5..4abcfe48f1d4 100644 > --- a/drivers/iio/light/hid-sensor-prox.c > +++ b/drivers/iio/light/hid-sensor-prox.c > @@ -23,6 +23,9 @@ struct prox_state { > struct hid_sensor_common common_attributes; > struct hid_sensor_hub_attribute_info prox_attr; > u32 human_presence; > + int scale_pre_decml; > + int scale_post_decml; > + int scale_precision; > }; > > static const u32 prox_sensitivity_addresses[] = { > @@ -98,8 +101,9 @@ static int prox_read_raw(struct iio_dev *indio_dev, > ret_type = IIO_VAL_INT; > break; > case IIO_CHAN_INFO_SCALE: > - *val = prox_state->prox_attr.units; > - ret_type = IIO_VAL_INT; > + *val = prox_state->scale_pre_decml; > + *val2 = prox_state->scale_post_decml; > + ret_type = prox_state->scale_precision; > break; > case IIO_CHAN_INFO_OFFSET: > *val = hid_sensor_convert_exponent( > @@ -221,6 +225,11 @@ static int prox_parse_report(struct platform_device *pdev, > dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, > st->prox_attr.report_id); > > + st->scale_precision = hid_sensor_format_scale( > + hsdev->usage, > + &st->prox_attr, > + &st->scale_pre_decml, &st->scale_post_decml); > + > return ret; > } >
On Sat, Jan 30, 2021 at 07:14:29PM +0000, Jonathan Cameron wrote: > On Sat, 30 Jan 2021 18:25:30 +0800 > Ye Xiang <xiang.ye@intel.com> wrote: > > > Currently, the proxy sensor scale is zero because it just return the > > exponent directly. To fix this issue, this patch use > > hid_sensor_format_scale to process the scale first then return the > > output. > > > > Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") > > Signed-off-by: Ye Xiang <xiang.ye@intel.com> > > Hi Ye Xiang, > > There was a bit of fuzz on this so please take a look at > my fixes-togreg branch and check it went in cleanly. Have checked, it's correct. Thanks Ye Xiang > > > > --- > > v2: > > - Add Fixes tag > > > > --- > > drivers/iio/light/hid-sensor-prox.c | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c > > index 4ab285a418d5..4abcfe48f1d4 100644 > > --- a/drivers/iio/light/hid-sensor-prox.c > > +++ b/drivers/iio/light/hid-sensor-prox.c > > @@ -23,6 +23,9 @@ struct prox_state { > > struct hid_sensor_common common_attributes; > > struct hid_sensor_hub_attribute_info prox_attr; > > u32 human_presence; > > + int scale_pre_decml; > > + int scale_post_decml; > > + int scale_precision; > > }; > > > > static const u32 prox_sensitivity_addresses[] = { > > @@ -98,8 +101,9 @@ static int prox_read_raw(struct iio_dev *indio_dev, > > ret_type = IIO_VAL_INT; > > break; > > case IIO_CHAN_INFO_SCALE: > > - *val = prox_state->prox_attr.units; > > - ret_type = IIO_VAL_INT; > > + *val = prox_state->scale_pre_decml; > > + *val2 = prox_state->scale_post_decml; > > + ret_type = prox_state->scale_precision; > > break; > > case IIO_CHAN_INFO_OFFSET: > > *val = hid_sensor_convert_exponent( > > @@ -221,6 +225,11 @@ static int prox_parse_report(struct platform_device *pdev, > > dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, > > st->prox_attr.report_id); > > > > + st->scale_precision = hid_sensor_format_scale( > > + hsdev->usage, > > + &st->prox_attr, > > + &st->scale_pre_decml, &st->scale_post_decml); > > + > > return ret; > > } > > >
On Sat, Jan 30, 2021 at 07:14:29PM +0000, Jonathan Cameron wrote: > On Sat, 30 Jan 2021 18:25:30 +0800 > Ye Xiang <xiang.ye@intel.com> wrote: > > > Currently, the proxy sensor scale is zero because it just return the > > exponent directly. To fix this issue, this patch use > > hid_sensor_format_scale to process the scale first then return the > > output. > > > > Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") > > Signed-off-by: Ye Xiang <xiang.ye@intel.com> > > Hi Ye Xiang, > > There was a bit of fuzz on this so please take a look at > my fixes-togreg branch and check it went in cleanly. Have checked fixes-toreg branch, the patch it's correct. Thanks Ye Xiang > > > > --- > > v2: > > - Add Fixes tag > > > > --- > > drivers/iio/light/hid-sensor-prox.c | 13 +++++++++++-- > > 1 file changed, 11 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c > > index 4ab285a418d5..4abcfe48f1d4 100644 > > --- a/drivers/iio/light/hid-sensor-prox.c > > +++ b/drivers/iio/light/hid-sensor-prox.c > > @@ -23,6 +23,9 @@ struct prox_state { > > struct hid_sensor_common common_attributes; > > struct hid_sensor_hub_attribute_info prox_attr; > > u32 human_presence; > > + int scale_pre_decml; > > + int scale_post_decml; > > + int scale_precision; > > }; > > > > static const u32 prox_sensitivity_addresses[] = { > > @@ -98,8 +101,9 @@ static int prox_read_raw(struct iio_dev *indio_dev, > > ret_type = IIO_VAL_INT; > > break; > > case IIO_CHAN_INFO_SCALE: > > - *val = prox_state->prox_attr.units; > > - ret_type = IIO_VAL_INT; > > + *val = prox_state->scale_pre_decml; > > + *val2 = prox_state->scale_post_decml; > > + ret_type = prox_state->scale_precision; > > break; > > case IIO_CHAN_INFO_OFFSET: > > *val = hid_sensor_convert_exponent( > > @@ -221,6 +225,11 @@ static int prox_parse_report(struct platform_device *pdev, > > dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, > > st->prox_attr.report_id); > > > > + st->scale_precision = hid_sensor_format_scale( > > + hsdev->usage, > > + &st->prox_attr, > > + &st->scale_pre_decml, &st->scale_post_decml); > > + > > return ret; > > } > > >
diff --git a/drivers/iio/light/hid-sensor-prox.c b/drivers/iio/light/hid-sensor-prox.c index 4ab285a418d5..4abcfe48f1d4 100644 --- a/drivers/iio/light/hid-sensor-prox.c +++ b/drivers/iio/light/hid-sensor-prox.c @@ -23,6 +23,9 @@ struct prox_state { struct hid_sensor_common common_attributes; struct hid_sensor_hub_attribute_info prox_attr; u32 human_presence; + int scale_pre_decml; + int scale_post_decml; + int scale_precision; }; static const u32 prox_sensitivity_addresses[] = { @@ -98,8 +101,9 @@ static int prox_read_raw(struct iio_dev *indio_dev, ret_type = IIO_VAL_INT; break; case IIO_CHAN_INFO_SCALE: - *val = prox_state->prox_attr.units; - ret_type = IIO_VAL_INT; + *val = prox_state->scale_pre_decml; + *val2 = prox_state->scale_post_decml; + ret_type = prox_state->scale_precision; break; case IIO_CHAN_INFO_OFFSET: *val = hid_sensor_convert_exponent( @@ -221,6 +225,11 @@ static int prox_parse_report(struct platform_device *pdev, dev_dbg(&pdev->dev, "prox %x:%x\n", st->prox_attr.index, st->prox_attr.report_id); + st->scale_precision = hid_sensor_format_scale( + hsdev->usage, + &st->prox_attr, + &st->scale_pre_decml, &st->scale_post_decml); + return ret; }
Currently, the proxy sensor scale is zero because it just return the exponent directly. To fix this issue, this patch use hid_sensor_format_scale to process the scale first then return the output. Fixes: 39a3a0138f61 ("iio: hid-sensors: Added Proximity Sensor Driver") Signed-off-by: Ye Xiang <xiang.ye@intel.com> --- v2: - Add Fixes tag --- drivers/iio/light/hid-sensor-prox.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)