* [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue
@ 2021-01-30 10:25 Ye Xiang
2021-01-30 19:14 ` Jonathan Cameron
0 siblings, 1 reply; 4+ messages in thread
From: Ye Xiang @ 2021-01-30 10:25 UTC (permalink / raw)
To: jikos, jic23, srinivas.pandruvada
Cc: linux-input, linux-iio, linux-kernel, Ye Xiang
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(-)
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;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue
2021-01-30 10:25 [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue Ye Xiang
@ 2021-01-30 19:14 ` Jonathan Cameron
2021-01-31 7:16 ` Ye, Xiang
2021-01-31 7:35 ` Ye, Xiang
0 siblings, 2 replies; 4+ messages in thread
From: Jonathan Cameron @ 2021-01-30 19:14 UTC (permalink / raw)
To: Ye Xiang; +Cc: jikos, srinivas.pandruvada, linux-input, linux-iio, linux-kernel
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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue
2021-01-30 19:14 ` Jonathan Cameron
@ 2021-01-31 7:16 ` Ye, Xiang
2021-01-31 7:35 ` Ye, Xiang
1 sibling, 0 replies; 4+ messages in thread
From: Ye, Xiang @ 2021-01-31 7:16 UTC (permalink / raw)
To: Jonathan Cameron
Cc: jikos, srinivas.pandruvada, linux-input, linux-iio, linux-kernel
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;
> > }
> >
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue
2021-01-30 19:14 ` Jonathan Cameron
2021-01-31 7:16 ` Ye, Xiang
@ 2021-01-31 7:35 ` Ye, Xiang
1 sibling, 0 replies; 4+ messages in thread
From: Ye, Xiang @ 2021-01-31 7:35 UTC (permalink / raw)
To: Jonathan Cameron
Cc: jikos, srinivas.pandruvada, linux-input, linux-iio, linux-kernel
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;
> > }
> >
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-01-31 7:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-30 10:25 [PATCH v2] iio: hid-sensor-prox: Fix scale not correct issue Ye Xiang
2021-01-30 19:14 ` Jonathan Cameron
2021-01-31 7:16 ` Ye, Xiang
2021-01-31 7:35 ` Ye, Xiang
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).