]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
iio: hid-sensors: Pressure: adjust scale and offset
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Fri, 18 Apr 2014 23:22:00 +0000 (00:22 +0100)
committerJonathan Cameron <jic23@kernel.org>
Mon, 5 May 2014 09:59:48 +0000 (10:59 +0100)
Using units and unit exponent to calculate scale which is compliant
to IIO ABI.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
drivers/iio/pressure/hid-sensor-press.c

index e0e6409aa94e3072f56ab3638ef41bcd56d20984..ff69da4443b83df5b0c8f0cd121b403f95de5349 100644 (file)
@@ -36,6 +36,10 @@ struct press_state {
        struct hid_sensor_common common_attributes;
        struct hid_sensor_hub_attribute_info press_attr;
        u32 press_data;
+       int scale_pre_decml;
+       int scale_post_decml;
+       int scale_precision;
+       int value_offset;
 };
 
 /* Channel definitions */
@@ -102,12 +106,12 @@ static int press_read_raw(struct iio_dev *indio_dev,
                ret_type = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_SCALE:
-               *val = press_state->press_attr.units;
-               ret_type = IIO_VAL_INT;
+               *val = press_state->scale_pre_decml;
+               *val2 = press_state->scale_post_decml;
+               ret_type = press_state->scale_precision;
                break;
        case IIO_CHAN_INFO_OFFSET:
-               *val = hid_sensor_convert_exponent(
-                               press_state->press_attr.unit_expo);
+               *val = press_state->value_offset;
                ret_type = IIO_VAL_INT;
                break;
        case IIO_CHAN_INFO_SAMP_FREQ:
@@ -229,6 +233,11 @@ static int press_parse_report(struct platform_device *pdev,
        dev_dbg(&pdev->dev, "press %x:%x\n", st->press_attr.index,
                        st->press_attr.report_id);
 
+       st->scale_precision = hid_sensor_format_scale(
+                               HID_USAGE_SENSOR_PRESSURE,
+                               &st->press_attr,
+                               &st->scale_pre_decml, &st->scale_post_decml);
+
        /* Set Sensitivity field ids, when there is no individual modifier */
        if (st->common_attributes.sensitivity.index < 0) {
                sensor_hub_input_get_attribute_info(hsdev,