iio: hid-sensors: Move get sensitivity attribute to hid-sensor-common

[linux-2.6-block.git] / drivers / iio / humidity / hid-sensor-humidity.c

diff --git a/drivers/iio/humidity/hid-sensor-humidity.c b/drivers/iio/humidity/hid-sensor-humidity.c
index 52f605114ef77e52473eb3d13793aa1c66937ff8..ec88ae3f233dea2fe6173f54af20229876c5ad4d 100644 (file)
--- a/drivers/iio/humidity/hid-sensor-humidity.c
+++ b/drivers/iio/humidity/hid-sensor-humidity.c
@@ -22,6 +22,10 @@ struct hid_humidity_state {
        int value_offset;
 };
 
+static const u32 humidity_sensitivity_addresses[] = {
+       HID_USAGE_SENSOR_ATMOSPHERIC_HUMIDITY,
+};
+
 /* Channel definitions */
 static const struct iio_chan_spec humidity_channels[] = {
        {
@@ -174,14 +178,6 @@ static int humidity_parse_report(struct platform_device *pdev,
                                                &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,
-                       HID_FEATURE_REPORT, usage_id,
-                       HID_USAGE_SENSOR_DATA_MOD_CHANGE_SENSITIVITY_ABS |
-                       HID_USAGE_SENSOR_ATMOSPHERIC_HUMIDITY,
-                       &st->common_attributes.sensitivity);
-
        return ret;
 }
 
@@ -210,7 +206,9 @@ static int hid_humidity_probe(struct platform_device *pdev)
 
        ret = hid_sensor_parse_common_attributes(hsdev,
                                        HID_USAGE_SENSOR_HUMIDITY,
-                                       &humid_st->common_attributes);
+                                       &humid_st->common_attributes,
+                                       humidity_sensitivity_addresses,
+                                       ARRAY_SIZE(humidity_sensitivity_addresses));
        if (ret)
                return ret;